nethack-gwaa-kiwi/nethack
1
0
Fork 0
Code Pull Requests Activity

split config file processing into its own src file

Browse Source
This commit is contained in:
nhmall
2025-05-21 23:58:01 -04:00
parent a4b971c744
commit 78a4fd2fb8
14 changed files with 1993 additions and 1952 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/decl.h
View File

@@ -258,7 +258,7 @@ struct instance_globals_c {
/* symbols.c */
int currentgraphics;
/* files.c */
/* files.c, cfgfiles.c */
char *cmdline_rcfile; /* set in unixmain.c, used in options.c */
char *config_section_chosen;
char *config_section_current;

37
include/extern.h
View File

@@ -310,6 +310,28 @@ extern boolean friday_13th(void);
extern int night(void);
extern int midnight(void);
/* ### cfgfiles.c ### */
#if !defined(CROSSCOMPILE) || defined(CROSSCOMPILE_TARGET)
extern int l_get_config_errors(lua_State *) NONNULLARG1;
#endif
extern int do_write_config_file(void);
extern boolean parse_config_line(char *) NONNULLARG1;
#ifdef USER_SOUNDS
extern boolean can_read_file(const char *) NONNULLARG1;
#endif
extern void config_error_init(boolean, const char *, boolean);
extern void config_erradd(const char *);
extern int config_error_done(void);
/* arg1 of read_config_file can be NULL to pass through
* to fopen_config_file() to mean 'use the default config file name' */
extern boolean read_config_file(const char *, int);
extern boolean parse_conf_str(const char *str, boolean (*proc)(char *));
extern boolean parse_conf_file(FILE *fp, boolean (*proc)(char *arg));
extern void set_configfile_name(const char *);
extern char *get_configfile(void);
extern const char *get_default_configfile(void);
/* ### coloratt.c ### */
extern char *color_attr_to_str(color_attr *);
@@ -1009,9 +1031,6 @@ extern void makerogueghost(void);
/* ### files.c ### */
extern const char *nh_basename(const char *, boolean) NONNULLARG1;
#if !defined(CROSSCOMPILE) || defined(CROSSCOMPILE_TARGET)
extern int l_get_config_errors(lua_State *) NONNULLARG1;
#endif
extern char *fname_encode(const char *, char,
char *, char *, int) NONNULLPTRS;
extern char *fname_decode(char, char *, char *, int) NONNULLPTRS;
@@ -1051,20 +1070,8 @@ extern void nh_compress(const char *);
extern void nh_uncompress(const char *);
extern boolean lock_file(const char *, int, int) NONNULLARG1;
extern void unlock_file(const char *) NONNULLARG1;
extern int do_write_config_file(void);
extern boolean parse_config_line(char *) NONNULLARG1;
#ifdef USER_SOUNDS
extern boolean can_read_file(const char *) NONNULLARG1;
#endif
extern void config_error_init(boolean, const char *, boolean);
extern void config_erradd(const char *);
extern int config_error_done(void);
/* arg1 of read_config_file can be NULL to pass through
* to fopen_config_file() to mean 'use the default config file name' */
extern boolean read_config_file(const char *, int);
extern void check_recordfile(const char *);
extern void read_wizkit(void);
extern boolean parse_conf_str(const char *str, boolean (*proc)(char *));
extern int read_sym_file(int);
extern void paniclog(const char *, const char *) NONNULLPTRS;
extern void testinglog(const char *, const char *, const char *);

1859
src/cfgfiles.c Normal file
View File

File diff suppressed because it is too large Load Diff

1848
src/files.c
View File

File diff suppressed because it is too large Load Diff

12
src/options.c
View File

@@ -111,7 +111,7 @@ static struct allopt_t allopt[SIZE(allopt_init)];
/* use rest of file */
extern char configfile[]; /* for messages; files.c */
/* extern char configfile[]; */ /* for messages; files.c */
extern const struct symparse loadsyms[];
#if defined(TOS)
extern boolean colors_changed; /* in tos.c */
@@ -457,8 +457,8 @@ ask_do_tutorial(void)
boolean norc;
int n, pass = 0;
rc = nh_basename(configfile, TRUE);
norc = !strcmp(configfile, "/dev/null");
rc = nh_basename(get_configfile(), TRUE);
norc = !strcmp(get_configfile(), "/dev/null");
Snprintf(buf, sizeof buf,
"Put \"OPTIONS=!tutorial\" in %s to skip this query.",
(rc && *rc && !norc) ? rc : "your configuration file");
@@ -6799,10 +6799,10 @@ staticfn void
rejectoption(const char *optname)
{
#ifdef MICRO
pline("\"%s\" settable only from %s.", optname, configfile);
pline("\"%s\" settable only from %s.", optname, get_configfile());
#else
pline("%s can be set only from NETHACKOPTIONS or %s.", optname,
configfile);
get_configfile());
#endif
}
@@ -9474,7 +9474,7 @@ option_help(void)
datawin = create_nhwindow(NHW_TEXT);
Snprintf(buf, sizeof buf,
"Set options as OPTIONS=<options> in %s", configfile);
"Set options as OPTIONS=<options> in %s", get_configfile());
opt_intro[CONFIG_SLOT] = (const char *) buf;
for (i = 0; opt_intro[i]; i++)
putstr(datawin, 0, opt_intro[i]);

50
sys/msdos/Makefile.GCC
View File

@@ -272,31 +272,31 @@ DLBOBJ = $(O)dlb.o
VOBJ01 = $(O)allmain.o $(O)alloc.o $(O)apply.o $(O)artifact.o $(O)attrib.o
VOBJ02 = $(O)ball.o $(O)bones.o $(O)botl.o $(O)calendar.o $(O)cmd.o
VOBJ03 = $(O)coloratt.o $(O)date.o $(O)dbridge.o $(O)decl.o $(O)detect.o
VOBJ04 = $(O)dig.o $(O)display.o $(O)do.o $(O)do_name.o $(O)do_wear.o
VOBJ05 = $(O)dog.o $(O)dogmove.o $(O)dokick.o $(O)dothrow.o $(O)drawing.o
VOBJ06 = $(O)dungeon.o $(O)eat.o $(O)end.o $(O)engrave.o $(O)exper.o
VOBJ07 = $(O)explode.o $(O)extralev.o $(O)files.o $(O)fountain.o $(O)getpos.o
VOBJ08 = $(O)glyphs.o $(O)getline.o $(O)hack.o $(O)hacklib.o $(O)insight.o
VOBJ09 = $(O)invent.o $(O)isaac64.o $(O)lock.o $(O)mail.o $(O)main.o
VOBJ10 = $(O)makemon.o $(O)mcastu.o $(O)mdlib.o $(O)mhitm.o $(O)mhitu.o
VOBJ11 = $(O)minion.o $(O)mkmap.o $(O)mklev.o $(O)mkmaze.o $(O)mkobj.o
VOBJ12 = $(O)mkroom.o $(O)mon.o $(O)mondata.o $(O)monmove.o $(O)monst.o
VOBJ13 = $(O)mplayer.o $(O)mthrowu.o $(O)muse.o $(O)music.o $(O)o_init.o
VOBJ14 = $(O)objects.o $(O)objnam.o $(O)options.o $(O)pickup.o $(O)pline.o
VOBJ15 = $(O)polyself.o $(O)potion.o $(O)quest.o $(O)questpgr.o $(O)pager.o
VOBJ16 = $(O)pray.o $(O)priest.o $(O)read.o $(O)rect.o $(O)region.o
VOBJ17 = $(O)report.o $(O)restore.o $(O)rip.o $(O)rnd.o $(O)role.o
VOBJ18 = $(O)rumors.o $(O)save.o $(O)selvar.o $(O)sfstruct.o $(O)shk.o
VOBJ19 = $(O)shknam.o $(O)sit.o $(O)sounds.o $(O)sp_lev.o $(O)spell.o
VOBJ20 = $(O)stairs.o $(O)steal.o $(O)steed.o $(O)symbols.o $(O)sys.o
VOBJ21 = $(O)teleport.o $(O)strutil.o $(O)termcap.o $(O)timeout.o $(O)topl.o
VOBJ22 = $(O)topten.o $(O)trap.o $(O)u_init.o $(O)uhitm.o $(O)utf8map.o
VOBJ23 = $(O)vault.o $(O)track.o $(O)vision.o $(O)weapon.o $(O)were.o
VOBJ24 = $(O)wield.o $(O)windows.o $(O)wintty.o $(O)wizard.o $(O)wizcmds.o
VOBJ25 = $(O)worm.o $(O)worn.o $(O)write.o $(O)zap.o $(O)light.o
VOBJ26 = $(O)dlb.o $(REGEX)
VOBJ02 = $(O)ball.o $(O)bones.o $(O)botl.o $(O)calendar.o $(O)cfgfiles.o
VOBJ03 = $(O)cmd.o $(O)coloratt.o $(O)date.o $(O)dbridge.o $(O)decl.o
VOBJ04 = $(O)detect.o $(O)dig.o $(O)display.o $(O)do.o $(O)do_name.o
VOBJ05 = $(O)do_wear.o $(O)dog.o $(O)dogmove.o $(O)dokick.o $(O)dothrow.o
VOBJ06 = $(O)drawing.o $(O)dungeon.o $(O)eat.o $(O)end.o $(O)engrave.o
VOBJ07 = $(O)exper.o $(O)explode.o $(O)extralev.o $(O)files.o $(O)fountain.o
VOBJ08 = $(O)getpos.o $(O)glyphs.o $(O)getline.o $(O)hack.o $(O)hacklib.o
VOBJ09 = $(O)insight.o $(O)invent.o $(O)isaac64.o $(O)lock.o $(O)mail.o
VOBJ10 = $(O)main.o $(O)makemon.o $(O)mcastu.o $(O)mdlib.o $(O)mhitm.o
VOBJ11 = $(O)mhitu.o $(O)minion.o $(O)mkmap.o $(O)mklev.o $(O)mkmaze.o
VOBJ12 = $(O)mkobj.o $(O)mkroom.o $(O)mon.o $(O)mondata.o $(O)monmove.o
VOBJ13 = $(O)monst.o $(O)mplayer.o $(O)mthrowu.o $(O)muse.o $(O)music.o
VOBJ14 = $(O)o_init.o $(O)objects.o $(O)objnam.o $(O)options.o $(O)pickup.o
VOBJ15 = $(O)pline.o $(O)polyself.o $(O)potion.o $(O)quest.o $(O)questpgr.o
VOBJ16 = $(O)pager.o $(O)pray.o $(O)priest.o $(O)read.o $(O)rect.o
VOBJ17 = $(O)region.o $(O)report.o $(O)restore.o $(O)rip.o $(O)rnd.o
VOBJ18 = $(O)role.o $(O)rumors.o $(O)save.o $(O)selvar.o $(O)sfstruct.o
VOBJ19 = $(O)shk.o $(O)shknam.o $(O)sit.o $(O)sounds.o $(O)sp_lev.o
VOBJ20 = $(O)spell.o $(O)stairs.o $(O)steal.o $(O)steed.o $(O)symbols.o
VOBJ21 = $(O)sys.o $(O)teleport.o $(O)strutil.o $(O)termcap.o $(O)timeout.o
VOBJ22 = $(O)topl.o $(O)topten.o $(O)trap.o $(O)u_init.o $(O)uhitm.o
VOBJ23 = $(O)utf8map.o $(O)vault.o $(O)track.o $(O)vision.o $(O)weapon.o
VOBJ24 = $(O)were.o $(O)wield.o $(O)windows.o $(O)wintty.o $(O)wizard.o
VOBJ25 = $(O)wizcmds.o $(O)worm.o $(O)worn.o $(O)write.o $(O)zap.o
VOBJ26 = $(O)light.o $(O)dlb.o $(REGEX)
SOBJ = $(O)msdos.o $(O)pcsys.o $(O)tty.o $(O)unix.o \
$(O)video.o $(O)vidtxt.o $(O)pckeys.o

3
sys/unix/Makefile.src
View File

@@ -582,7 +582,7 @@ HOSTOBJ = $(FIRSTOBJ) alloc.o drawing.o
HOBJ = $(TARGETPFX)allmain.o $(TARGETPFX)alloc.o \
$(TARGETPFX)apply.o $(TARGETPFX)artifact.o $(TARGETPFX)attrib.o \
$(TARGETPFX)ball.o $(TARGETPFX)bones.o $(TARGETPFX)botl.o \
$(TARGETPFX)calendar.o $(TARGETPFX)cmd.o \
$(TARGETPFX)calendar.o $(TARGETPFX)cfgfiles.o $(TARGETPFX)cmd.o \
$(TARGETPFX)coloratt.o $(TARGETPFX)dbridge.o $(TARGETPFX)decl.o \
$(TARGETPFX)detect.o $(TARGETPFX)dig.o $(TARGETPFX)display.o \
$(TARGETPFX)dlb.o $(TARGETPFX)do.o $(TARGETPFX)do_name.o \
@@ -1127,6 +1127,7 @@ $(TARGETPFX)ball.o: ball.c $(HACK_H)
$(TARGETPFX)bones.o: bones.c $(HACK_H)
$(TARGETPFX)botl.o: botl.c $(HACK_H)
$(TARGETPFX)calendar.o: calendar.c $(HACK_H)
$(TARGETPFX)cfgfiles.o: cfgfiles.c $(HACK_H)
$(TARGETPFX)cmd.o: cmd.c $(HACK_H) ../include/func_tab.h
$(TARGETPFX)coloratt.o: coloratt.c $(HACK_H)
$(TARGETPFX)dbridge.o: dbridge.c $(HACK_H)

4
sys/unix/NetHack.xcodeproj/project.pbxproj
View File

@@ -165,6 +165,7 @@
5493735A277AAE830031FE02 /* alloc.c in Sources */ = {isa = PBXBuildFile; fileRef = 31B8A36521A238040055BD01 /* alloc.c */; };
54A3D3EC282C55A900143F8C /* utf8map.c in Sources */ = {isa = PBXBuildFile; fileRef = 54A3D3EB282C55A900143F8C /* utf8map.c */; };
54BD340D2D8B70350073C484 /* hacklib.c in Sources */ = {isa = PBXBuildFile; fileRef = 31B8A36421A238040055BD01 /* hacklib.c */; };
54EBA6D32DDED3F100CD20EC /* cfgfiles.c in Sources */ = {isa = PBXBuildFile; fileRef = 54EBA6D22DDED3F100CD20EC /* cfgfiles.c */; };
54FB2B4B246310A600397C0E /* symbols.c in Sources */ = {isa = PBXBuildFile; fileRef = 54FB2B4A246310A600397C0E /* symbols.c */; };
54FCE8292223261F00F393C8 /* isaac64.c in Sources */ = {isa = PBXBuildFile; fileRef = 54FCE8282223261F00F393C8 /* isaac64.c */; };
BAB57DB527C1C3E200FCF150 /* libnhlua.a in Frameworks */ = {isa = PBXBuildFile; fileRef = BAE8010A27B97760002B3786 /* libnhlua.a */; };
@@ -545,6 +546,7 @@
54BD34102D8B711E0073C484 /* selvar.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = selvar.h; path = ../../include/selvar.h; sourceTree = "<group>"; };
54BD34112D8B711E0073C484 /* stairs.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = stairs.h; path = ../../include/stairs.h; sourceTree = "<group>"; };
54BD34122D8B711E0073C484 /* weight.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = weight.h; path = ../../include/weight.h; sourceTree = "<group>"; };
54EBA6D22DDED3F100CD20EC /* cfgfiles.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = cfgfiles.c; path = /Users/mikeallison/Documents/git/NHsource/src/cfgfiles.c; sourceTree = "<absolute>"; };
54FB2B4A246310A600397C0E /* symbols.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = symbols.c; path = ../../src/symbols.c; sourceTree = "<group>"; };
54FCE8282223261F00F393C8 /* isaac64.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = isaac64.c; path = ../../src/isaac64.c; sourceTree = "<group>"; };
BAE8010A27B97760002B3786 /* libnhlua.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libnhlua.a; sourceTree = BUILT_PRODUCTS_DIR; };
@@ -657,6 +659,7 @@
3189578C21A1FF8200FB2ABE /* src */ = {
isa = PBXGroup;
children = (
54EBA6D22DDED3F100CD20EC /* cfgfiles.c */,
056E43BB2C810EE800FD1F52 /* calendar.c */,
056E43BC2C810EE800FD1F52 /* coloratt.c */,
056E43BD2C810EE800FD1F52 /* getpos.c */,
@@ -1790,6 +1793,7 @@
31B8A3D121A238060055BD01 /* do.c in Sources */,
31B8A39021A238060055BD01 /* objnam.c in Sources */,
31B8A3B621A238060055BD01 /* bones.c in Sources */,
54EBA6D32DDED3F100CD20EC /* cfgfiles.c in Sources */,
31B8A3C521A238060055BD01 /* timeout.c in Sources */,
31B8A3AD21A238060055BD01 /* uhitm.c in Sources */,
31B8A3B321A238060055BD01 /* track.c in Sources */,

11
sys/vms/Makefile.src
View File

@@ -147,8 +147,8 @@ HACK_H = $(SRC)hack.h-t
# all .c that are part of the main NetHack program and are not operating- or
# windowing-system specific
HACKCSRC = allmain.c alloc.c apply.c artifact.c attrib.c ball.c bones.c \
botl.c calendar.c cmd.c coloratt.c dbridge.c decl.c detect.c dig.c \
display.c dlb.c do.c do_name.c do_wear.c dog.c dogmove.c dokick.c \
botl.c calendar.c cfgfiles.c cmd.c coloratt.c dbridge.c decl.c detect.c \
dig.c display.c dlb.c do.c do_name.c do_wear.c dog.c dogmove.c dokick.c \
dothrow.c drawing.c dungeon.c eat.c end.c engrave.c exper.c \
explode.c extralev.c files.c fountain.c getpos.c glyphs.c hack.c \
hacklib.c insight.c invent.c light.c lock.c \
@@ -191,9 +191,9 @@ FIRSTOBJ = vmsmisc.obj,vmsfiles.obj,monst.obj,objects.obj
# split up long list so that we can write pieces of it into nethack.opt
HOBJ1 = allmain.obj,alloc.obj,apply.obj,artifact.obj,attrib.obj, \
ball.obj,bones.obj,botl.obj,calendar.obj,cmd.obj,coloratt.obj, \
dbridge.obj,decl.obj,detect.obj,dig.obj,display.obj,dlb.obj, \
do.obj,do_name.obj,do_wear.obj
ball.obj,bones.obj,botl.obj,calendar.obj,cfgfiles.obj,cmd.obj, \
coloratt.obj,dbridge.obj,decl.obj,detect.obj,dig.obj,display.obj, \
dlb.obj,do.obj,do_name.obj,do_wear.obj
HOBJ2 = dog.obj,dogmove.obj,dokick.obj,dothrow.obj,drawing.obj, \
dungeon.obj,eat.obj,end.obj,engrave.obj,exper.obj,explode.obj, \
extralev.obj,files.obj,fountain.obj,getpos.obj,glyphs.obj,hack.obj, \
@@ -500,6 +500,7 @@ ball.obj : ball.c $(HACK_H)
bones.obj : bones.c $(HACK_H)
botl.obj : botl.c $(HACK_H)
cmd.obj : cmd.c $(HACK_H) $(INC)func_tab.h
cfgfiles.obj : cfgfiles.c $(HACK_H)
dbridge.obj : dbridge.c $(HACK_H)
decl.obj : decl.c $(HACK_H)
detect.obj : detect.c $(HACK_H) $(INC)artifact.h

1
sys/vms/Makefile_src.vms
View File

@@ -701,6 +701,7 @@ $(TARGETPFX)ball.obj: ball.c $(HACK_H)
$(TARGETPFX)bones.obj: bones.c $(HACK_H)
$(TARGETPFX)botl.obj: botl.c $(HACK_H)
$(TARGETPFX)calendar.obj: calendar.c $(HACK_H)
$(TARGETPFX)cfgfiles.obj: cfgfiles.c $(HACK_H)
$(TARGETPFX)cmd.obj: cmd.c $(HACK_H) $(INCL)func_tab.h
$(TARGETPFX)coloratt.obj: coloratt.c $(HACK_H)
$(TARGETPFX)dbridge.obj: dbridge.c $(HACK_H)

2
sys/windows/GNUmakefile
View File

@@ -1000,7 +1000,7 @@ endif # HAVE_SOUNDLIB
# nethackw
#==========================================
COREOBJS = $(addsuffix .o, allmain alloc apply artifact attrib ball bones botl \
calendar cmd coloratt cppregex \
calendar cfgfiles cmd coloratt cppregex \
dbridge decl detect dig display dlb do do_name do_wear \
dog dogmove dokick dothrow drawing dungeon \
eat end engrave exper explode extralev files fountain \

114
sys/windows/Makefile.nmake
View File

@@ -846,34 +846,34 @@ TTYOBJTTY = $(OTTY)topl.o $(OTTY)getline.o $(OTTY)wintty.o
COREOBJTTY = \
$(OTTY)allmain.o $(OTTY)alloc.o $(OTTY)apply.o $(OTTY)artifact.o \
$(OTTY)attrib.o $(OTTY)ball.o $(OTTY)bones.o $(OTTY)botl.o \
$(OTTY)calendar.o $(OTTY)cmd.o $(OTTY)coloratt.o $(OTTY)dbridge.o \
$(OTTY)decl.o $(OTTY)detect.o $(OTTY)dig.o $(OTTY)display.o \
$(OTTY)do.o $(OTTY)do_name.o $(OTTY)do_wear.o $(OTTY)dog.o \
$(OTTY)dogmove.o $(OTTY)dokick.o $(OTTY)dothrow.o $(OTTY)drawing.o \
$(OTTY)dungeon.o $(OTTY)eat.o $(OTTY)end.o $(OTTY)engrave.o \
$(OTTY)exper.o $(OTTY)explode.o $(OTTY)extralev.o $(OTTY)files.o \
$(OTTY)fountain.o $(OTTY)getpos.o $(OTTY)glyphs.o $(OTTY)hack.o \
$(OTTY)insight.o $(OTTY)invent.o $(OTTY)isaac64.o $(OTTY)light.o \
$(OTTY)lock.o $(OTTY)mail.o $(OTTY)makemon.o $(OTTY)mcastu.o \
$(OTTY)mhitm.o $(OTTY)mhitu.o $(OTTY)minion.o $(OTTY)mklev.o \
$(OTTY)mkmap.o $(OTTY)mkmaze.o $(OTTY)mkobj.o $(OTTY)mkroom.o \
$(OTTY)mon.o $(OTTY)mondata.o $(OTTY)monmove.o $(OTTY)monst.o \
$(OTTY)mplayer.o $(OTTY)mthrowu.o $(OTTY)muse.o $(OTTY)music.o \
$(OTTY)o_init.o $(OTTY)objects.o $(OTTY)objnam.o $(OTTY)options.o \
$(OTTY)pager.o $(OTTY)pickup.o $(OTTY)pline.o $(OTTY)polyself.o \
$(OTTY)potion.o $(OTTY)pray.o $(OTTY)priest.o $(OTTY)quest.o \
$(OTTY)questpgr.o $(OTTY)read.o $(OTTY)rect.o $(OTTY)region.o \
$(OTTY)report.o $(OTTY)restore.o $(OTTY)rip.o $(OTTY)rnd.o \
$(OTTY)role.o $(OTTY)rumors.o $(OTTY)save.o $(OTTY)selvar.o \
$(OTTY)sfstruct.o $(OTTY)shk.o $(OTTY)shknam.o $(OTTY)sit.o \
$(OTTY)sounds.o $(OTTY)sp_lev.o $(OTTY)spell.o $(OTTY)stairs.o \
$(OTTY)steal.o $(OTTY)steed.o $(OTTY)strutil.o $(OTTY)symbols.o \
$(OTTY)sys.o $(OTTY)teleport.o $(OTTY)timeout.o $(OTTY)topten.o \
$(OTTY)track.o $(OTTY)trap.o $(OTTY)u_init.o $(OTTY)uhitm.o \
$(OTTY)utf8map.o $(OTTY)vault.o $(OTTY)vision.o $(OTTY)weapon.o \
$(OTTY)were.o $(OTTY)wield.o $(OTTY)windows.o $(OTTY)wizard.o \
$(OTTY)wizcmds.o $(OTTY)worm.o $(OTTY)worn.o $(OTTY)write.o \
$(OTTY)zap.o
$(OTTY)calendar.o $(OTTY)cfgfiles.o $(OTTY)cmd.o $(OTTY)coloratt.o \
$(OTTY)dbridge.o $(OTTY)decl.o $(OTTY)detect.o $(OTTY)dig.o \
$(OTTY)display.o $(OTTY)do.o $(OTTY)do_name.o $(OTTY)do_wear.o \
$(OTTY)dog.o $(OTTY)dogmove.o $(OTTY)dokick.o $(OTTY)dothrow.o \
$(OTTY)drawing.o $(OTTY)dungeon.o $(OTTY)eat.o $(OTTY)end.o \
$(OTTY)engrave.o $(OTTY)exper.o $(OTTY)explode.o $(OTTY)extralev.o \
$(OTTY)files.o $(OTTY)fountain.o $(OTTY)getpos.o $(OTTY)glyphs.o \
$(OTTY)hack.o $(OTTY)insight.o $(OTTY)invent.o $(OTTY)isaac64.o \
$(OTTY)light.o $(OTTY)lock.o $(OTTY)mail.o $(OTTY)makemon.o \
$(OTTY)mcastu.o $(OTTY)mhitm.o $(OTTY)mhitu.o $(OTTY)minion.o \
$(OTTY)mklev.o $(OTTY)mkmap.o $(OTTY)mkmaze.o $(OTTY)mkobj.o \
$(OTTY)mkroom.o $(OTTY)mon.o $(OTTY)mondata.o $(OTTY)monmove.o \
$(OTTY)monst.o $(OTTY)mplayer.o $(OTTY)mthrowu.o $(OTTY)muse.o \
$(OTTY)music.o $(OTTY)o_init.o $(OTTY)objects.o $(OTTY)objnam.o \
$(OTTY)options.o $(OTTY)pager.o $(OTTY)pickup.o $(OTTY)pline.o \
$(OTTY)polyself.o $(OTTY)potion.o $(OTTY)pray.o $(OTTY)priest.o \
$(OTTY)quest.o $(OTTY)questpgr.o $(OTTY)read.o $(OTTY)rect.o \
$(OTTY)region.o $(OTTY)report.o $(OTTY)restore.o $(OTTY)rip.o \
$(OTTY)rnd.o $(OTTY)role.o $(OTTY)rumors.o $(OTTY)save.o \
$(OTTY)selvar.o $(OTTY)sfstruct.o $(OTTY)shk.o $(OTTY)shknam.o \
$(OTTY)sit.o $(OTTY)sounds.o $(OTTY)sp_lev.o $(OTTY)spell.o \
$(OTTY)stairs.o $(OTTY)steal.o $(OTTY)steed.o $(OTTY)strutil.o \
$(OTTY)symbols.o $(OTTY)sys.o $(OTTY)teleport.o $(OTTY)timeout.o \
$(OTTY)topten.o $(OTTY)track.o $(OTTY)trap.o $(OTTY)u_init.o \
$(OTTY)uhitm.o $(OTTY)utf8map.o $(OTTY)vault.o $(OTTY)vision.o \
$(OTTY)weapon.o $(OTTY)were.o $(OTTY)wield.o $(OTTY)windows.o \
$(OTTY)wizard.o $(OTTY)wizcmds.o $(OTTY)worm.o $(OTTY)worn.o \
$(OTTY)write.o $(OTTY)zap.o
OBJSTTY = $(MDLIBTTY) $(COREOBJTTY) $(REGEXTTY) $(RANDOMTTY)
@@ -909,34 +909,34 @@ GUIOBJ = $(OGUI)mhaskyn.o $(OGUI)mhdlg.o \
COREOBJGUI = \
$(OGUI)allmain.o $(OGUI)alloc.o $(OGUI)apply.o $(OGUI)artifact.o \
$(OGUI)attrib.o $(OGUI)ball.o $(OGUI)bones.o $(OGUI)botl.o \
$(OGUI)calendar.o $(OGUI)cmd.o $(OGUI)coloratt.o $(OGUI)dbridge.o \
$(OGUI)decl.o $(OGUI)detect.o $(OGUI)dig.o $(OGUI)display.o \
$(OGUI)do.o $(OGUI)do_name.o $(OGUI)do_wear.o $(OGUI)dog.o \
$(OGUI)dogmove.o $(OGUI)dokick.o $(OGUI)dothrow.o $(OGUI)drawing.o \
$(OGUI)dungeon.o $(OGUI)eat.o $(OGUI)end.o $(OGUI)engrave.o \
$(OGUI)exper.o $(OGUI)explode.o $(OGUI)extralev.o $(OGUI)files.o \
$(OGUI)fountain.o $(OGUI)getpos.o $(OGUI)glyphs.o $(OGUI)hack.o \
$(OGUI)insight.o $(OGUI)invent.o $(OGUI)isaac64.o $(OGUI)light.o \
$(OGUI)lock.o $(OGUI)mail.o $(OGUI)makemon.o $(OGUI)mcastu.o \
$(OGUI)mhitm.o $(OGUI)mhitu.o $(OGUI)minion.o $(OGUI)mklev.o \
$(OGUI)mkmap.o $(OGUI)mkmaze.o $(OGUI)mkobj.o $(OGUI)mkroom.o \
$(OGUI)mon.o $(OGUI)mondata.o $(OGUI)monmove.o $(OGUI)monst.o \
$(OGUI)mplayer.o $(OGUI)mthrowu.o $(OGUI)muse.o $(OGUI)music.o \
$(OGUI)o_init.o $(OGUI)objects.o $(OGUI)objnam.o $(OGUI)options.o \
$(OGUI)pager.o $(OGUI)pickup.o $(OGUI)pline.o $(OGUI)polyself.o \
$(OGUI)potion.o $(OGUI)pray.o $(OGUI)priest.o $(OGUI)quest.o \
$(OGUI)questpgr.o $(OGUI)read.o $(OGUI)rect.o $(OGUI)region.o \
$(OGUI)report.o $(OGUI)restore.o $(OGUI)rip.o $(OGUI)rnd.o \
$(OGUI)role.o $(OGUI)rumors.o $(OGUI)save.o $(OGUI)selvar.o \
$(OGUI)sfstruct.o $(OGUI)shk.o $(OGUI)shknam.o $(OGUI)sit.o \
$(OGUI)sounds.o $(OGUI)sp_lev.o $(OGUI)spell.o $(OGUI)stairs.o \
$(OGUI)steal.o $(OGUI)steed.o $(OGUI)strutil.o $(OGUI)symbols.o \
$(OGUI)sys.o $(OGUI)teleport.o $(OGUI)timeout.o $(OGUI)topten.o \
$(OGUI)track.o $(OGUI)trap.o $(OGUI)u_init.o $(OGUI)uhitm.o \
$(OGUI)utf8map.o $(OGUI)vault.o $(OGUI)vision.o $(OGUI)weapon.o \
$(OGUI)were.o $(OGUI)wield.o $(OGUI)windows.o $(OGUI)wizard.o \
$(OGUI)wizcmds.o $(OGUI)worm.o $(OGUI)worn.o $(OGUI)write.o \
$(OGUI)zap.o
$(OGUI)calendar.o $(OGUI)cfgfiles.o $(OGUI)cmd.o $(OGUI)coloratt.o \
$(OGUI)dbridge.o $(OGUI)decl.o $(OGUI)detect.o $(OGUI)dig.o \
$(OGUI)display.o $(OGUI)do.o $(OGUI)do_name.o $(OGUI)do_wear.o \
$(OGUI)dog.o $(OGUI)dogmove.o $(OGUI)dokick.o $(OGUI)dothrow.o \
$(OGUI)drawing.o $(OGUI)dungeon.o $(OGUI)eat.o $(OGUI)end.o \
$(OGUI)engrave.o $(OGUI)exper.o $(OGUI)explode.o $(OGUI)extralev.o \
$(OGUI)files.o $(OGUI)fountain.o $(OGUI)getpos.o $(OGUI)glyphs.o \
$(OGUI)hack.o $(OGUI)insight.o $(OGUI)invent.o $(OGUI)isaac64.o \
$(OGUI)light.o $(OGUI)lock.o $(OGUI)mail.o $(OGUI)makemon.o \
$(OGUI)mcastu.o $(OGUI)mhitm.o $(OGUI)mhitu.o $(OGUI)minion.o \
$(OGUI)mklev.o $(OGUI)mkmap.o $(OGUI)mkmaze.o $(OGUI)mkobj.o \
$(OGUI)mkroom.o $(OGUI)mon.o $(OGUI)mondata.o $(OGUI)monmove.o \
$(OGUI)monst.o $(OGUI)mplayer.o $(OGUI)mthrowu.o $(OGUI)muse.o \
$(OGUI)music.o $(OGUI)o_init.o $(OGUI)objects.o $(OGUI)objnam.o \
$(OGUI)options.o $(OGUI)pager.o $(OGUI)pickup.o $(OGUI)pline.o \
$(OGUI)polyself.o $(OGUI)potion.o $(OGUI)pray.o $(OGUI)priest.o \
$(OGUI)quest.o $(OGUI)questpgr.o $(OGUI)read.o $(OGUI)rect.o \
$(OGUI)region.o $(OGUI)report.o $(OGUI)restore.o $(OGUI)rip.o \
$(OGUI)rnd.o $(OGUI)role.o $(OGUI)rumors.o $(OGUI)save.o \
$(OGUI)selvar.o $(OGUI)sfstruct.o $(OGUI)shk.o $(OGUI)shknam.o \
$(OGUI)sit.o $(OGUI)sounds.o $(OGUI)sp_lev.o $(OGUI)spell.o \
$(OGUI)stairs.o $(OGUI)steal.o $(OGUI)steed.o $(OGUI)strutil.o \
$(OGUI)symbols.o $(OGUI)sys.o $(OGUI)teleport.o $(OGUI)timeout.o \
$(OGUI)topten.o $(OGUI)track.o $(OGUI)trap.o $(OGUI)u_init.o \
$(OGUI)uhitm.o $(OGUI)utf8map.o $(OGUI)vault.o $(OGUI)vision.o \
$(OGUI)weapon.o $(OGUI)were.o $(OGUI)wield.o $(OGUI)windows.o \
$(OGUI)wizard.o $(OGUI)wizcmds.o $(OGUI)worm.o $(OGUI)worn.o \
$(OGUI)write.o $(OGUI)zap.o
OBJSGUI = $(MDLIBGUI) $(COREOBJGUI) $(REGEXGUI) $(RANDOMGUI)
@@ -2962,6 +2962,7 @@ $(OTTY)ball.o: ball.c $(HACK_H)
$(OTTY)bones.o: bones.c $(HACK_H)
$(OTTY)botl.o: botl.c $(HACK_H)
$(OTTY)calendar.o: calendar.c $(HACK_H)
$(OTTY)cfgfiles.o: cfgfiles.c $(HACK_H)
$(OTTY)cmd.o: cmd.c $(HACK_H) $(INCL)func_tab.h
$(OTTY)coloratt.o: coloratt.c $(HACK_H)
$(OTTY)dbridge.o: dbridge.c $(HACK_H)
@@ -3338,6 +3339,7 @@ $(OGUI)ball.o: ball.c $(HACK_H)
$(OGUI)bones.o: bones.c $(HACK_H)
$(OGUI)botl.o: botl.c $(HACK_H)
$(OGUI)calendar.o: calendar.c $(HACK_H)
$(OGUI)cfgfiles.o: cfgfiles.c $(HACK_H)
$(OGUI)cmd.o: cmd.c $(HACK_H) $(INCL)func_tab.h
$(OGUI)coloratt.o: coloratt.c $(HACK_H)
$(OGUI)dbridge.o: dbridge.c $(HACK_H)

1
sys/windows/vs/NetHack/NetHack.vcxproj
View File

@@ -82,6 +82,7 @@
<ClCompile Include="$(SrcDir)bones.c" />
<ClCompile Include="$(SrcDir)botl.c" />
<ClCompile Include="$(SrcDir)calendar.c" />
<ClCompile Include="$(SrcDir)cfgfiles.c" />
<ClCompile Include="$(SrcDir)cmd.c" />
<ClCompile Include="$(SrcDir)coloratt.c" />
<ClCompile Include="$(SrcDir)dbridge.c" />

1
sys/windows/vs/NetHackW/NetHackW.vcxproj
View File

@@ -90,6 +90,7 @@
<ClCompile Include="$(SrcDir)bones.c" />
<ClCompile Include="$(SrcDir)botl.c" />
<ClCompile Include="$(SrcDir)calendar.c" />
<ClCompile Include="$(SrcDir)cfgfiles.c" />
<ClCompile Include="$(SrcDir)cmd.c" />
<ClCompile Include="$(SrcDir)coloratt.c" />
<ClCompile Include="$(SrcDir)date.c" />