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:
Bart House
2019-07-14 23:36:56 -07:00
32 changed files with 162 additions and 822 deletions

View File

@@ -433,10 +433,6 @@ struct instance_flags {
chosen_windowport[], but do not switch to
it in the midst of options processing */
boolean obsolete; /* obsolete options can point at this, it isn't used */
boolean fuzzer_auto_start; /* start fuzzer automatically */
int fuzzer_stop_and_save; /* move when fuzzer stops and saves game */
boolean fuzzer_saving; /* fuzzer is saving game */
int verbose_logging_start; /* move when verbose fuzzer logging starts */
};
/*