more win32 de-MICRO

diff --git a/src/end.c b/src/end.c
index 020f35b0de7687cd363ed84c89a0215d5faa5523..a62fe2901c7c1b795b7e9968d1dbbb91cd6f00f4 100644 (file)
--- a/src/end.c
+++ b/src/end.c
@@ -58,7 +58,11 @@ extern void FDECL(nethack_exit,(int));
 # ifdef SYSV
 # define NH_abort()    (void) abort()
 # else
+#  ifdef WIN32
+# define NH_abort()    win32_abort()
+#  else
 # define NH_abort()    abort()
+#  endif
 # endif
 #endif
 
@@ -266,12 +270,10 @@ panic VA_DECL(const char *, str)
 #if defined(WIZARD) && !defined(MICRO)
 # if defined(NOTIFY_NETHACK_BUGS)
        if (!wizard)
-           raw_printf("Report error to \"%s\".\n%s.\n",
-                       "nethack-bugs@nethack.org",
-                       !program_state.something_worth_saving ? "" :
-                       "An error save file will be created.\n");
+           raw_printf("Report the following error to \"%s\".",
+                       "nethack-bugs@nethack.org");
        else if (program_state.something_worth_saving)
-           raw_print("\nAn error save file will be created.\n");
+           raw_print("\nError save file being written.\n");
 # else
        if (!wizard)
            raw_printf("Report error to \"%s\"%s.",
@@ -293,7 +295,7 @@ panic VA_DECL(const char *, str)
            Vsprintf(buf,str,VA_ARGS);
            raw_print(buf);
        }
-#if defined(WIZARD) && (defined(UNIX) || defined(VMS) || defined(LATTICE))
+#if defined(WIZARD) && (defined(UNIX) || defined(VMS) || defined(LATTICE) || defined(WIN32))
        if (wizard)
            NH_abort(); /* generate core dump */
 #endif

diff --git a/win/tty/wintty.c b/win/tty/wintty.c
index 8dc0dfb6d2a85ce274c13f3402675ede75b278a5..fe8007a836821ca9648b142c55f1fbf1694de092 100644 (file)
--- a/win/tty/wintty.c
+++ b/win/tty/wintty.c
@@ -675,7 +675,7 @@ tty_askname()
                if (c == '\b' || c == '\177') {
                        if(ct) {
                                ct--;
-#ifdef MICRO
+#if defined(MICRO) || defined(WIN32CON)
 # if defined(WIN32CON)
                                backsp();       /* \b is visible on NT */
 # else
@@ -700,7 +700,7 @@ tty_askname()
                if(c < 'A' || (c > 'Z' && c < 'a') || c > 'z') c = '_';
 #endif
                if (ct < (int)(sizeof plname) - 1) {
-#if defined(MICRO)
+#if defined(MICRO) || defined(WIN32CON)
 # if defined(MSDOS)
                        if (iflags.grmode) {
                                (void) putchar(c);
@@ -2442,7 +2442,7 @@ tty_raw_print(str)
     const char *str;
 {
     if(ttyDisplay) ttyDisplay->rawprint++;
-#ifdef MICRO
+#if defined(MICRO) || defined(WIN32CON)
     msmsg("%s\n", str);
 #else
     puts(str); (void) fflush(stdout);
@@ -2455,13 +2455,13 @@ tty_raw_print_bold(str)
 {
     if(ttyDisplay) ttyDisplay->rawprint++;
     term_start_raw_bold();
-#ifdef MICRO
+#if defined(MICRO) || defined(WIN32CON)
     msmsg("%s", str);
 #else
     (void) fputs(str, stdout);
 #endif
     term_end_raw_bold();
-#ifdef MICRO
+#if defined(MICRO) || defined(WIN32CON)
     msmsg("\n");
 #else
     puts("");