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:
@@ -470,17 +470,6 @@ struct early_opt {
|
||||
boolean valallowed;
|
||||
};
|
||||
|
||||
struct ptr_array {
|
||||
size_t length;
|
||||
size_t max_length;
|
||||
void ** elements;
|
||||
};
|
||||
typedef struct ptr_array ptr_array_t;
|
||||
|
||||
/* logging verbosity levels */
|
||||
#define LOG_MINIMAL 0
|
||||
#define LOG_VERBOSE 1
|
||||
|
||||
/* special key functions */
|
||||
enum nh_keyfunc {
|
||||
NHKF_ESC = 0,
|
||||
|
||||
Reference in New Issue
Block a user