Merge branch 'NetHack-3.6'
# Conflicts: # DEVEL/Developer.txt # include/config.h # include/decl.h # include/display.h # include/extern.h # include/global.h # include/hack.h # include/patchlevel.h # src/display.c # src/dothrow.c # src/makemon.c # src/monst.c # src/objnam.c # src/sp_lev.c # src/wield.c # src/zap.c # sys/share/pmatchregex.c # sys/winnt/Makefile.msc
This commit is contained in:
@@ -305,9 +305,7 @@
|
||||
|
||||
#define HLOCK "perm" /* an empty file used for locking purposes */
|
||||
|
||||
#ifndef NEW_KEYBOARD_HIT
|
||||
#define tgetch getchar
|
||||
#endif
|
||||
|
||||
#ifndef NOSHELL
|
||||
#define SHELL /* do not delete the '!' command */
|
||||
|
||||
Reference in New Issue
Block a user