Merge branch 'NetHack-3.6.2'

sys/winnt/nttty.c

@@ -83,6 +83,7 @@ static void NDECL(check_and_set_font);
 static boolean NDECL(check_font_widths);
 static void NDECL(set_known_good_console_font);
 static void NDECL(restore_original_console_font);
+extern void NDECL(safe_routines);
 
 /* Win32 Screen buffer,coordinate,console I/O information */
 COORD ntcoord;
@@ -413,6 +414,13 @@ int mode; // unused
     really_move_cursor();
 }
 
+void
+nttty_exit()
+{
+    /* go back to using the safe routines */
+    safe_routines();
+}
+
 int
 process_keystroke(ir, valid, numberpad, portdebug)
 INPUT_RECORD *ir;
@@ -1701,6 +1709,7 @@ void set_cp_map()
     }
 }
 
+#if 0
 /* early_raw_print() is used during early game intialization prior to the
  * setting up of the windowing system.  This allows early errors and panics
  * to have there messages displayed.
@@ -1760,8 +1769,10 @@ void early_raw_print(const char *s)
     SetConsoleCursorPosition(console.hConOut, console.cursor);
 
 }
+#endif
 
-/* nethack_enter_nttty() is the first thing that is called from main.
+/* nethack_enter_nttty() is the first thing that is called from main
+ * once the tty port is confirmed.
  *
  * We initialize all console state to support rendering to the console
  * through out flipping support at this time.  This allows us to support
@@ -1787,9 +1798,10 @@ void early_raw_print(const char *s)
 
 void nethack_enter_nttty()
 {
+#if 0
     /* set up state needed by early_raw_print() */
     windowprocs.win_raw_print = early_raw_print;
-
+#endif
     console.hConOut = GetStdHandle(STD_OUTPUT_HANDLE);
     nhassert(console.hConOut != NULL); // NOTE: this assert will not print