win32gui: make error() work

- in 3.4.0 it was useless in the graphical port.
This commit is contained in:
nethack.allison
2002-03-23 22:47:44 +00:00
parent f777aceb74
commit 87a86749ff
3 changed files with 16 additions and 3 deletions
+1
View File
@@ -19,4 +19,5 @@ wall symbol not replaced when digging while blind and levitating
Platform- and/or Interface-Specific Fixes Platform- and/or Interface-Specific Fixes
----------------------------------------- -----------------------------------------
win32gui: make error() work; it was essentially non-operative in 3.4.0
win32tty: honour the use_inverse option and default to ATR_BOLD if disabled win32tty: honour the use_inverse option and default to ATR_BOLD if disabled
+5
View File
@@ -117,7 +117,12 @@ getlock()
if((fd = open(fq_lock,0)) == -1) { if((fd = open(fq_lock,0)) == -1) {
if(errno == ENOENT) goto gotlock; /* no such file */ if(errno == ENOENT) goto gotlock; /* no such file */
chdirx(orgdir, 0); chdirx(orgdir, 0);
#if defined(WIN32)
error("Bad directory or name: %s\n%s\n",
fq_lock, strerror(errno));
#else
perror(fq_lock); perror(fq_lock);
#endif
unlock_file(HLOCK); unlock_file(HLOCK);
error("Cannot open %s", fq_lock); error("Cannot open %s", fq_lock);
} }
+10 -3
View File
@@ -209,9 +209,16 @@ error VA_DECL(const char *,s)
VA_INIT(s, const char *); VA_INIT(s, const char *);
/* error() may get called before tty is initialized */ /* error() may get called before tty is initialized */
if (iflags.window_inited) end_screen(); if (iflags.window_inited) end_screen();
putchar('\n'); if (!strncmpi(windowprocs.name, "tty", 3)) {
Vprintf(s,VA_ARGS); putchar('\n');
putchar('\n'); Vprintf(s,VA_ARGS);
putchar('\n');
} else {
char buf[BUFSZ];
(void) vsprintf(buf, s, VA_ARGS);
Strcat(buf, "\n");
raw_printf(buf);
}
VA_END(); VA_END();
exit(EXIT_FAILURE); exit(EXIT_FAILURE);
} }