Merge branch 'NetHack-3.6'

2019-07-10 21:58:58 -04:00
parent e7c66af5f5 58583cacf8
commit 7dfffbb712
22 changed files with 270 additions and 46 deletions
--- a/src/allmain.c
+++ b/src/allmain.c
@@ -379,7 +379,11 @@ boolean resuming;
        if (g.multi >= 0 && g.occupation) {
 #if defined(MICRO) || defined(WIN32)
            abort_lev = 0;
+#ifdef NEW_KEYBOARD_HIT
+            if (keyboard_hit()) {
+#else
            if (kbhit()) {
+#endif
                if ((ch = pgetchar()) == ABORT)
                    abort_lev++;
                else