From: nhmall Date: Sat, 14 Dec 2019 22:18:48 +0000 (-0500) Subject: include/lev.h is an empty header file so just get rid of it X-Git-Tag: NetHack-3.7.0_WIP~137 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=480c3eb6e0f2a7f5628c2d46dc894e288f1ed091;p=nethack include/lev.h is an empty header file so just get rid of it --- diff --git a/include/lev.h b/include/lev.h deleted file mode 100644 index 731944702..000000000 --- a/include/lev.h +++ /dev/null @@ -1,12 +0,0 @@ -/* NetHack 3.6 lev.h $NHDT-Date: 1432512781 2015/05/25 00:13:01 $ $NHDT-Branch: master $:$NHDT-Revision: 1.12 $ */ -/* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */ -/*-Copyright (c) Michael Allison, 2006. */ -/* NetHack may be freely redistributed. See license for details. */ - -/* Common include file for save and restore routines */ - -#ifndef LEV_H -#define LEV_H - - -#endif /* LEV_H */ diff --git a/src/bones.c b/src/bones.c index 0d56edd48..8ebe47cea 100644 --- a/src/bones.c +++ b/src/bones.c @@ -4,8 +4,6 @@ /* NetHack may be freely redistributed. See license for details. */ #include "hack.h" -#include "lev.h" - #ifdef MFLOPPY extern long bytes_counted; diff --git a/src/cmd.c b/src/cmd.c index ee8b15f1b..b2d93f624 100644 --- a/src/cmd.c +++ b/src/cmd.c @@ -4,7 +4,6 @@ /* NetHack may be freely redistributed. See license for details. */ #include "hack.h" -#include "lev.h" #include "func_tab.h" /* Macros for meta and ctrl modifiers: diff --git a/src/do.c b/src/do.c index f4d2e57af..65913f1dc 100644 --- a/src/do.c +++ b/src/do.c @@ -6,7 +6,6 @@ /* Contains code for 'd', 'D' (drop), '>', '<' (up, down) */ #include "hack.h" -#include "lev.h" static void FDECL(trycall, (struct obj *)); static void NDECL(polymorph_sink); diff --git a/src/dungeon.c b/src/dungeon.c index 5d34f76b7..54a13c9ae 100644 --- a/src/dungeon.c +++ b/src/dungeon.c @@ -6,7 +6,6 @@ #include "hack.h" #include "dgn_file.h" #include "dlb.h" -#include "lev.h" #define DUNGEON_FILE "dungeon.lua" diff --git a/src/end.c b/src/end.c index bc8cc7ead..c35677ed2 100644 --- a/src/end.c +++ b/src/end.c @@ -6,7 +6,6 @@ #define NEED_VARARGS /* comment line for pre-compiled headers */ #include "hack.h" -#include "lev.h" #ifndef NO_SIGNAL #include #endif diff --git a/src/engrave.c b/src/engrave.c index 35dcb5896..8d37b0027 100644 --- a/src/engrave.c +++ b/src/engrave.c @@ -4,7 +4,6 @@ /* NetHack may be freely redistributed. See license for details. */ #include "hack.h" -#include "lev.h" static NEARDATA struct engr *head_engr; static const char *NDECL(blengr); diff --git a/src/files.c b/src/files.c index d7d1b4e7c..d0e55445a 100644 --- a/src/files.c +++ b/src/files.c @@ -8,7 +8,6 @@ #include "hack.h" #include "dlb.h" #include -#include "lev.h" #ifdef TTY_GRAPHICS #include "wintty.h" /* more() */ diff --git a/src/light.c b/src/light.c index f1341a78d..243282bfe 100644 --- a/src/light.c +++ b/src/light.c @@ -3,7 +3,6 @@ /* NetHack may be freely redistributed. See license for details. */ #include "hack.h" -#include "lev.h" /* for checking save modes */ /* * Mobile light sources. diff --git a/src/mkmaze.c b/src/mkmaze.c index 275836466..27c5ee490 100644 --- a/src/mkmaze.c +++ b/src/mkmaze.c @@ -5,7 +5,6 @@ #include "hack.h" #include "sp_lev.h" -#include "lev.h" /* save & restore info */ static int FDECL(iswall, (int, int)); static int FDECL(iswall_or_stone, (int, int)); diff --git a/src/o_init.c b/src/o_init.c index 467b9079d..7f9931ae8 100644 --- a/src/o_init.c +++ b/src/o_init.c @@ -4,7 +4,6 @@ /* NetHack may be freely redistributed. See license for details. */ #include "hack.h" -#include "lev.h" /* save & restore info */ static void FDECL(setgemprobs, (d_level *)); static void FDECL(shuffle, (int, int, BOOLEAN_P)); diff --git a/src/region.c b/src/region.c index 0432b5d13..cc2215e7e 100644 --- a/src/region.c +++ b/src/region.c @@ -3,7 +3,6 @@ /* NetHack may be freely redistributed. See license for details. */ #include "hack.h" -#include "lev.h" /* * This should really go into the level structure, but diff --git a/src/restore.c b/src/restore.c index 84eef5ee1..635286cc0 100644 --- a/src/restore.c +++ b/src/restore.c @@ -4,7 +4,6 @@ /* NetHack may be freely redistributed. See license for details. */ #include "hack.h" -#include "lev.h" #include "tcap.h" /* for TERMLIB and ASCIIGRAPH */ #if defined(MICRO) diff --git a/src/rumors.c b/src/rumors.c index 2236de102..b11c39d31 100644 --- a/src/rumors.c +++ b/src/rumors.c @@ -4,7 +4,6 @@ /* NetHack may be freely redistributed. See license for details. */ #include "hack.h" -#include "lev.h" #include "dlb.h" /* [note: this comment is fairly old, but still accurate for 3.1] diff --git a/src/save.c b/src/save.c index 3cb7e1a8d..aff484987 100644 --- a/src/save.c +++ b/src/save.c @@ -4,7 +4,6 @@ /* NetHack may be freely redistributed. See license for details. */ #include "hack.h" -#include "lev.h" #ifndef NO_SIGNAL #include diff --git a/src/timeout.c b/src/timeout.c index 585924528..5ded81904 100644 --- a/src/timeout.c +++ b/src/timeout.c @@ -4,7 +4,6 @@ /* NetHack may be freely redistributed. See license for details. */ #include "hack.h" -#include "lev.h" /* for checking save modes */ static void NDECL(stoned_dialogue); static void NDECL(vomiting_dialogue); diff --git a/src/version.c b/src/version.c index 8af580ec4..c2b5ab416 100644 --- a/src/version.c +++ b/src/version.c @@ -6,7 +6,6 @@ #include "hack.h" #include "dlb.h" #include "date.h" -#include "lev.h" /* * All the references to the contents of patchlevel.h have been moved diff --git a/src/worm.c b/src/worm.c index 6c139581f..3d7fb3f93 100644 --- a/src/worm.c +++ b/src/worm.c @@ -4,7 +4,6 @@ /* NetHack may be freely redistributed. See license for details. */ #include "hack.h" -#include "lev.h" #define newseg() (struct wseg *) alloc(sizeof (struct wseg)) #define dealloc_seg(wseg) free((genericptr_t) (wseg)) diff --git a/sys/amiga/Makefile.agc b/sys/amiga/Makefile.agc index e57e18698..da5b38567 100644 --- a/sys/amiga/Makefile.agc +++ b/sys/amiga/Makefile.agc @@ -938,7 +938,7 @@ $(O)attrib.o: $(NHS)attrib.c $(HDEP) $(I)artifact.h $(O)ball.o: $(NHS)ball.c $(HDEP) -$(O)bones.o: $(NHS)bones.c $(HDEP) $(I)lev.h +$(O)bones.o: $(NHS)bones.c $(HDEP) $(O)botl.o: $(NHS)botl.c $(HDEP) @@ -956,7 +956,7 @@ $(O)display.o: $(NHS)display.c $(HDEP) $(O)dlb.o: $(NHS)dlb.c $(HDEP) $(I)dlb.h -$(O)do.o: $(NHS)do.c $(HDEP) $(I)lev.h +$(O)do.o: $(NHS)do.c $(HDEP) $(O)do_name.o: $(NHS)do_name.c $(HDEP) @@ -977,9 +977,9 @@ $(O)dungeon.o: $(NHS)dungeon.c $(HDEP) $(I)dgn_file.h $(I)dlb.h $(O)eat.o: $(NHS)eat.c $(HDEP) -$(O)end.o: $(NHS)end.c $(HDEP) $(I)lev.h $(I)dlb.h +$(O)end.o: $(NHS)end.c $(HDEP) $(I)dlb.h -$(O)engrave.o: $(NHS)engrave.c $(HDEP) $(I)lev.h +$(O)engrave.o: $(NHS)engrave.c $(HDEP) $(O)exper.o: $(NHS)exper.c $(HDEP) @@ -997,7 +997,7 @@ $(O)hacklib.o: $(NHS)hacklib.c $(HDEP) $(O)invent.o: $(NHS)invent.c $(HDEP) $(I)artifact.h -$(O)light.o: $(NHS)light.c $(HDEP) $(I)lev.h +$(O)light.o: $(NHS)light.c $(HDEP) $(O)lock.o: $(NHS)lock.c $(HDEP) @@ -1020,7 +1020,7 @@ $(O)mklev.o: $(NHS)mklev.c $(HDEP) $(O)mkmap.o: $(NHS)mkmap.c $(HDEP) $(I)sp_lev.h -$(O)mkmaze.o: $(NHS)mkmaze.c $(HDEP) $(I)sp_lev.h $(I)lev.h +$(O)mkmaze.o: $(NHS)mkmaze.c $(HDEP) $(I)sp_lev.h $(O)mkobj.o: $(NHS)mkobj.c $(HDEP) $(I)artifact.h $(I)prop.h @@ -1046,7 +1046,7 @@ $(O)muse.o: $(NHS)muse.c $(HDEP) $(O)music.o: $(NHS)music.c $(HDEP) #interp.c -$(O)o_init.o: $(NHS)o_init.c $(HDEP) $(I)lev.h +$(O)o_init.o: $(NHS)o_init.c $(HDEP) $(O)objects.o: $(NHS)objects.c $(I)config.h $(I)obj.h $(I)objclass.h \ $(I)prop.h $(I)skills.h $(I)color.h @@ -1081,7 +1081,7 @@ $(O)rect.o: $(NHS)rect.c $(HDEP) $(O)region.o: $(NHS)region.c $(HDEP) -$(O)restore.o: $(NHS)restore.c $(HDEP) $(I)lev.h $(I)tcap.h $(I)quest.h +$(O)restore.o: $(NHS)restore.c $(HDEP) $(I)tcap.h $(I)quest.h $(O)rnd.o: $(NHS)rnd.c $(HDEP) @@ -1089,7 +1089,7 @@ $(O)role.o: $(NHS)role.c $(HDEP) $(O)rumors.o: $(NHS)rumors.c $(HDEP) $(I)dlb.h -$(O)save.o: $(NHS)save.c $(HDEP) $(I)lev.h $(I)quest.h +$(O)save.o: $(NHS)save.c $(HDEP) $(I)quest.h $(O)shk.o: $(NHS)shk.c $(HDEP) $(CC) $(CFLAGS) $(CFLAGS2) $(OBJSPEC)$@ $(NHS)shk.c @@ -1112,7 +1112,7 @@ $(O)sys.o: $(NHS)sys.c $(HDEP) $(O)teleport.o: $(NHS)teleport.c $(HDEP) -$(O)timeout.o: $(NHS)timeout.c $(HDEP) $(I)lev.h +$(O)timeout.o: $(NHS)timeout.c $(HDEP) $(O)topten.o: $(NHS)topten.c $(HDEP) $(I)dlb.h @@ -1142,7 +1142,7 @@ $(O)windows.o: $(NHS)windows.c $(HDEP) $(I)wintty.h $(O)wizard.o: $(NHS)wizard.c $(HDEP) -$(O)worm.o: $(NHS)worm.c $(HDEP) $(I)lev.h +$(O)worm.o: $(NHS)worm.c $(HDEP) $(O)worn.o: $(NHS)worn.c $(HDEP) diff --git a/sys/amiga/Makefile.ami b/sys/amiga/Makefile.ami index 3ad97af5e..b1b8691c3 100644 --- a/sys/amiga/Makefile.ami +++ b/sys/amiga/Makefile.ami @@ -699,7 +699,7 @@ $(SBIN)lev_comp: $(SPLEVOBJS) $(SBIN)dgn_comp: $(DGNCOMPOBJS) $(LINK) $(LNSPEC) $(SBIN)dgn_comp $(LIN) $(DGNCOMPOBJS) $(FBFIL) $(FLLIB) -$(OO)lev_yacc.o: $(UTIL)lev_yacc.c $(HDEP) $(I)sp_lev.h $(I)pm.h $(I)onames.h +$(OO)lev_yacc.o: $(UTIL)lev_yacc.c $(HDEP) $(I)pm.h $(I)onames.h # setdate $(UTIL)lev_yacc.c $(CC) $(DEFSPEC)LEV_LEX_C $(DEFSPEC)PREFIX="NH:slib/" $(CFLAGS) \ $(DEFSPEC)alloca=malloc $(OBJSPEC)$@ $(UTIL)lev_yacc.c @@ -1268,7 +1268,7 @@ $(O)attrib.o: $(NHS)attrib.c $(HDEP) $(I)artifact.h $(O)ball.o: $(NHS)ball.c $(HDEP) -$(O)bones.o: $(NHS)bones.c $(HDEP) $(I)lev.h +$(O)bones.o: $(NHS)bones.c $(HDEP) $(O)botl.o: $(NHS)botl.c $(HDEP) @@ -1286,7 +1286,7 @@ $(O)display.o: $(NHS)display.c $(HDEP) $(O)dlb.o: $(NHS)dlb.c $(HDEP) $(I)dlb.h -$(O)do.o: $(NHS)do.c $(HDEP) $(I)lev.h +$(O)do.o: $(NHS)do.c $(HDEP) $(O)do_name.o: $(NHS)do_name.c $(HDEP) @@ -1307,9 +1307,9 @@ $(O)dungeon.o: $(NHS)dungeon.c $(HDEP) $(I)dgn_file.h $(I)dlb.h $(O)eat.o: $(NHS)eat.c $(HDEP) -$(O)end.o: $(NHS)end.c $(HDEP) $(I)lev.h $(I)dlb.h +$(O)end.o: $(NHS)end.c $(HDEP) $(I)dlb.h -$(O)engrave.o: $(NHS)engrave.c $(HDEP) $(I)lev.h +$(O)engrave.o: $(NHS)engrave.c $(HDEP) $(O)exper.o: $(NHS)exper.c $(HDEP) @@ -1327,7 +1327,7 @@ $(O)hacklib.o: $(NHS)hacklib.c $(HDEP) $(O)invent.o: $(NHS)invent.c $(HDEP) $(I)artifact.h -$(O)light.o: $(NHS)light.c $(HDEP) $(I)lev.h +$(O)light.o: $(NHS)light.c $(HDEP) $(O)lock.o: $(NHS)lock.c $(HDEP) @@ -1350,7 +1350,7 @@ $(O)mklev.o: $(NHS)mklev.c $(HDEP) $(O)mkmap.o: $(NHS)mkmap.c $(HDEP) $(I)sp_lev.h -$(O)mkmaze.o: $(NHS)mkmaze.c $(HDEP) $(I)sp_lev.h $(I)lev.h +$(O)mkmaze.o: $(NHS)mkmaze.c $(HDEP) $(I)sp_lev.h $(O)mkobj.o: $(NHS)mkobj.c $(HDEP) $(I)artifact.h $(I)prop.h @@ -1377,7 +1377,7 @@ $(O)muse.o: $(NHS)muse.c $(HDEP) $(O)music.o: $(NHS)music.c $(HDEP) #interp.c -$(O)o_init.o: $(NHS)o_init.c $(HDEP) $(I)lev.h +$(O)o_init.o: $(NHS)o_init.c $(HDEP) $(O)objects.o: $(NHS)objects.c $(I)config.h $(I)obj.h $(I)objclass.h \ $(I)prop.h $(I)skills.h $(I)color.h @@ -1413,7 +1413,7 @@ $(O)rect.o: $(NHS)rect.c $(HDEP) $(O)region.o: $(NHS)region.c $(HDEP) -$(O)restore.o: $(NHS)restore.c $(HDEP) $(I)lev.h $(I)tcap.h $(I)quest.h +$(O)restore.o: $(NHS)restore.c $(HDEP) $(I)tcap.h $(I)quest.h $(O)rnd.o: $(NHS)rnd.c $(HDEP) @@ -1421,7 +1421,7 @@ $(O)role.o: $(NHS)role.c $(HDEP) $(O)rumors.o: $(NHS)rumors.c $(HDEP) $(I)dlb.h -$(O)save.o: $(NHS)save.c $(HDEP) $(I)lev.h $(I)quest.h +$(O)save.o: $(NHS)save.c $(HDEP) $(I)quest.h $(O)shk.o: $(NHS)shk.c $(HDEP) #SFD_INSTEAD #none @@ -1445,7 +1445,7 @@ $(O)sys.o: $(NHS)sys.c $(HDEP) $(O)teleport.o: $(NHS)teleport.c $(HDEP) -$(O)timeout.o: $(NHS)timeout.c $(HDEP) $(I)lev.h +$(O)timeout.o: $(NHS)timeout.c $(HDEP) $(O)topten.o: $(NHS)topten.c $(HDEP) $(I)dlb.h @@ -1478,7 +1478,7 @@ $(O)windows.o: $(NHS)windows.c $(HDEP) $(I)wintty.h $(O)wizard.o: $(NHS)wizard.c $(HDEP) -$(O)worm.o: $(NHS)worm.c $(HDEP) $(I)lev.h +$(O)worm.o: $(NHS)worm.c $(HDEP) $(O)worn.o: $(NHS)worn.c $(HDEP) diff --git a/sys/msdos/Makefile.BC b/sys/msdos/Makefile.BC index c68df0593..beb4b9758 100644 --- a/sys/msdos/Makefile.BC +++ b/sys/msdos/Makefile.BC @@ -879,7 +879,6 @@ DATE_H = $(INCL)\date.h DGN_FILE_H = $(INCL)\dgn_file.h DLB_H = $(INCL)\dlb.h FUNC_TAB_H = $(INCL)\func_tab.h -LEV_H = $(INCL)\lev.h LEV_COMP_H = $(INCL)\lev_comp.h MAIL_H = $(INCL)\mail.h MFNDPOS_H = $(INCL)\mfndpos.h @@ -1789,7 +1788,7 @@ $(O)alloc.o: $(SRC)\alloc.c $(CONFIG_H) @echo $(BCOPTS2) >> $(VROOMMCFG) $(CC) $(CFLAGSN) $(COBJNAM)$@ $(SRC)\alloc.c $(O)ball.o: $(PCHO) $(SRC)\ball.c $(HACK_H) -$(O)bones.o: $(PCHO) $(SRC)\bones.c $(HACK_H) $(LEV_H) +$(O)bones.o: $(PCHO) $(SRC)\bones.c $(HACK_H) $(O)decl.o: $(PCHO) $(SRC)\decl.c $(HACK_H) $(QUEST_H) $(O)detect.o: $(PCHO) $(SRC)\detect.c $(HACK_H) $(ARTIFACT_H) $(O)dig.o: $(PCHO) $(SRC)\dig.c $(HACK_H) # check dep @@ -1806,7 +1805,7 @@ $(O)drawing.o: $(SRC)\drawing.c $(HACK_H) $(TERMCAP_H) @echo $(BCOPTS1) >> $(VROOMMCFG) @echo $(BCOPTS2) >> $(VROOMMCFG) $(CC) $(CFLAGSN) $(COBJNAM)$@ $(SRC)\drawing.c -$(O)end.o: $(SRC)\end.c $(HACK_H) $(LEV_H) $(DLB_H) +$(O)end.o: $(SRC)\end.c $(HACK_H) $(DLB_H) @type schema$(SCHEMA).bc | find "$(@B)_o" > $(VROOMMCFG) @echo $(BCOPTS1) >> $(VROOMMCFG) @echo $(BCOPTS2) >> $(VROOMMCFG) @@ -1819,7 +1818,7 @@ $(O)mapglyph.o: $(PCHO) $(SRC)\mapglyph.c $(HACK_H) $(O)minion.o: $(PCHO) $(SRC)\minion.c $(HACK_H) $(O)mklev.o: $(PCHO) $(SRC)\mklev.c $(HACK_H) $(O)mkmap.o: $(PCHO) $(SRC)\mkmap.c $(HACK_H) $(SP_LEV_H) -$(O)mkmaze.o: $(PCHO) $(SRC)\mkmaze.c $(HACK_H) $(SP_LEV_H) $(LEV_H) +$(O)mkmaze.o: $(PCHO) $(SRC)\mkmaze.c $(HACK_H) $(SP_LEV_H) $(O)monst.o: $(SRC)\monst.c $(CONFIG_H) $(PERMONST_H) $(MONSYM_H) \ $(COLOR_H) $(ALIGN_H) @type schema$(SCHEMA).bc | find "$(@B)_o" > $(VROOMMCFG) @@ -1834,7 +1833,7 @@ $(O)monstr.o: $(SRC)\monstr.c $(CONFIG_H) $(O)mplayer.o: $(PCHO) $(SRC)\mplayer.c $(HACK_H) $(O)muse.o: $(PCHO) $(SRC)\muse.c $(HACK_H) $(O)music.o: $(PCHO) $(SRC)\music.c $(HACK_H) -$(O)o_init.o: $(PCHO) $(SRC)\o_init.c $(HACK_H) $(LEV_H) +$(O)o_init.o: $(PCHO) $(SRC)\o_init.c $(HACK_H) $(O)objects.o: $(SRC)\objects.c $(CONFIG_H) $(OBJ_H) $(OBJCLASS_H) \ $(PROP_H) $(COLOR_H) @type schema$(SCHEMA).bc | find "$(@B)_o" > $(VROOMMCFG) @@ -1857,12 +1856,12 @@ $(O)quest.o: $(PCHO) $(SRC)\quest.c $(HACK_H) $(QUEST_H) $(O)questpgr.o: $(PCHO) $(SRC)\questpgr.c $(HACK_H) $(DLB_H) $(O)rect.o: $(PCHO) $(SRC)\rect.c $(HACK_H) $(O)region.o: $(PCHO) $(SRC)\region.c $(HACK_H) -$(O)restore.o: $(PCHO) $(SRC)\restore.c $(HACK_H) $(LEV_H) $(TERMCAP_H) \ +$(O)restore.o: $(PCHO) $(SRC)\restore.c $(HACK_H) $(TERMCAP_H) \ $(QUEST_H) $(O)rip.o: $(PCHO) $(SRC)\rip.c $(HACK_H) $(O)role.o: $(PCHO) $(SRC)\role.c $(HACK_H) $(O)rumors.o: $(PCHO) $(SRC)\rumors.c $(HACK_H) $(DLB_H) -$(O)save.o: $(PCHO) $(SRC)\save.c $(HACK_H) $(LEV_H) $(QUEST_H) +$(O)save.o: $(PCHO) $(SRC)\save.c $(HACK_H) $(QUEST_H) $(O)sit.o: $(PCHO) $(SRC)\sit.c $(HACK_H) $(ARTIFACT_H) $(O)steed.o: $(PCHO) $(SRC)\steed.c $(HACK_H) $(O)sys.o: $(PCHO) $(SRC)\sys.c $(HACK_H) @@ -1882,7 +1881,7 @@ $(O)vis_tab.o: $(SRC)\vis_tab.c $(HACK_H) $(VIS_TAB_H) $(CC) $(CFLAGSN) $(COBJNAM)$@ $(SRC)\vis_tab.c $(O)wield.o: $(PCHO) $(SRC)\wield.c $(HACK_H) $(O)windows.o: $(PCHO) $(SRC)\windows.c $(HACK_H) $(WINTTY_H) -$(O)worm.o: $(PCHO) $(SRC)\worm.c $(HACK_H) $(LEV_H) +$(O)worm.o: $(PCHO) $(SRC)\worm.c $(HACK_H) $(O)worn.o: $(PCHO) $(SRC)\worn.c $(HACK_H) $(O)write.o: $(PCHO) $(SRC)\write.c $(HACK_H) @@ -1900,14 +1899,14 @@ $(O)attrib.0: $(PCH0) $(SRC)\attrib.c $(HACK_H) $(O)botl.0: $(PCH0) $(SRC)\botl.c $(HACK_H) $(O)cmd.0: $(PCH0) $(SRC)\cmd.c $(HACK_H) $(FUNC_TAB_H) $(O)dbridge.0: $(PCH0) $(SRC)\dbridge.c $(HACK_H) -$(O)do.0: $(PCH0) $(SRC)\do.c $(HACK_H) $(LEV_H) +$(O)do.0: $(PCH0) $(SRC)\do.c $(HACK_H) $(O)do_name.0: $(PCH0) $(SRC)\do_name.c $(HACK_H) $(O)do_wear.0: $(PCH0) $(SRC)\do_wear.c $(HACK_H) $(O)dogmove.0: $(PCH0) $(SRC)\dogmove.c $(HACK_H) $(MFNDPOS_H) $(O)dungeon.0: $(PCH0) $(SRC)\dungeon.c $(HACK_H) $(ALIGN_H) $(DGN_FILE_H) \ $(DLB_H) $(O)eat.0: $(PCH0) $(SRC)\eat.c $(HACK_H) -$(O)engrave.0: $(PCH0) $(SRC)\engrave.c $(HACK_H) $(LEV_H) +$(O)engrave.0: $(PCH0) $(SRC)\engrave.c $(HACK_H) $(O)explode.0: $(PCH0) $(SRC)\explode.c $(HACK_H) $(O)hacklib.0: $(PCH0) $(SRC)\hacklib.c $(HACK_H) $(O)invent.0: $(PCH0) $(SRC)\invent.c $(HACK_H) $(ARTIFACT_H) @@ -1931,7 +1930,7 @@ $(O)shk.0: $(PCH0) $(SRC)\shk.c $(HACK_H) $(O)shknam.0: $(PCH0) $(SRC)\shknam.c $(HACK_H) $(O)sounds.0: $(PCH0) $(SRC)\sounds.c $(HACK_H) $(O)steal.0: $(PCH0) $(SRC)\steal.c $(HACK_H) -$(O)timeout.0: $(PCH0) $(SRC)\timeout.c $(HACK_H) $(LEV_H) +$(O)timeout.0: $(PCH0) $(SRC)\timeout.c $(HACK_H) $(O)track.0: $(PCH0) $(SRC)\track.c $(HACK_H) $(O)trap.0: $(PCH0) $(SRC)\trap.c $(HACK_H) $(O)vault.0: $(PCH0) $(SRC)\vault.c $(HACK_H) @@ -1951,12 +1950,12 @@ $(O)attrib.1: $(PCH1) $(SRC)\attrib.c $(HACK_H) $(O)botl.1: $(PCH1) $(SRC)\botl.c $(HACK_H) $(O)cmd.1: $(PCH1) $(SRC)\cmd.c $(HACK_H) $(FUNC_TAB_H) $(O)dbridge.1: $(PCH1) $(SRC)\dbridge.c $(HACK_H) -$(O)do.1: $(PCH1) $(SRC)\do.c $(HACK_H) $(LEV_H) +$(O)do.1: $(PCH1) $(SRC)\do.c $(HACK_H) $(O)do_wear.1: $(PCH1) $(SRC)\do_wear.c $(HACK_H) $(O)dog.1: $(PCH1) $(SRC)\dog.c $(HACK_H) $(O)dungeon.1: $(PCH1) $(SRC)\dungeon.c $(HACK_H) $(ALIGN_H) $(DGN_FILE_H) $(DLB_H) $(O)eat.1: $(PCH1) $(SRC)\eat.c $(HACK_H) -$(O)engrave.1: $(PCH1) $(SRC)\engrave.c $(HACK_H) $(LEV_H) +$(O)engrave.1: $(PCH1) $(SRC)\engrave.c $(HACK_H) $(O)explode.1: $(PCH1) $(SRC)\explode.c $(HACK_H) $(O)hack.1: $(PCH1) $(SRC)\hack.c $(HACK_H) $(O)hacklib.1: $(PCH1) $(SRC)\hacklib.c $(HACK_H) @@ -1973,7 +1972,7 @@ $(O)polyself.1: $(PCH1) $(SRC)\polyself.c $(HACK_H) $(O)rnd.1: $(PCH1) $(SRC)\rnd.c $(HACK_H) $(O)shk.1: $(PCH1) $(SRC)\shk.c $(HACK_H) $(O)steal.1: $(PCH1) $(SRC)\steal.c $(HACK_H) -$(O)timeout.1: $(PCH1) $(SRC)\timeout.c $(HACK_H) $(LEV_H) +$(O)timeout.1: $(PCH1) $(SRC)\timeout.c $(HACK_H) $(O)track.1: $(PCH1) $(SRC)\track.c $(HACK_H) $(O)trap.1: $(PCH1) $(SRC)\trap.c $(HACK_H) $(O)weapon.1: $(PCH1) $(SRC)\weapon.c $(HACK_H) @@ -1984,11 +1983,11 @@ $(O)zap.1: $(PCH1) $(SRC)\zap.c $(HACK_H) # $(O)attrib.2: $(PCH2) $(SRC)\attrib.c $(HACK_H) -$(O)do.2: $(PCH2) $(SRC)\do.c $(HACK_H) $(LEV_H) +$(O)do.2: $(PCH2) $(SRC)\do.c $(HACK_H) $(O)do_name.2: $(PCH2) $(SRC)\do_name.c $(HACK_H) $(O)do_wear.2: $(PCH2) $(SRC)\do_wear.c $(HACK_H) $(O)dog.2: $(PCH2) $(SRC)\dog.c $(HACK_H) -$(O)engrave.2: $(PCH2) $(SRC)\engrave.c $(HACK_H) $(LEV_H) +$(O)engrave.2: $(PCH2) $(SRC)\engrave.c $(HACK_H) $(O)hack.2: $(PCH2) $(SRC)\hack.c $(HACK_H) $(O)hacklib.2: $(PCH2) $(SRC)\hacklib.c $(HACK_H) $(O)invent.2: $(PCH2) $(SRC)\invent.c $(HACK_H) $(ARTIFACT_H) @@ -2004,7 +2003,7 @@ $(O)zap.2: $(PCH2) $(SRC)\zap.c $(HACK_H) # OVL3 # -$(O)do.3: $(PCH3) $(SRC)\do.c $(HACK_H) $(LEV_H) +$(O)do.3: $(PCH3) $(SRC)\do.c $(HACK_H) $(O)hack.3: $(PCH3) $(SRC)\hack.c $(HACK_H) $(O)invent.3: $(PCH3) $(SRC)\invent.c $(HACK_H) $(ARTIFACT_H) $(O)light.3: $(PCH3) $(SRC)\light.c $(HACK_H) @@ -2023,13 +2022,13 @@ $(O)attrib.B: $(PCHB) $(SRC)\attrib.c $(HACK_H) $(O)botl.B: $(PCHB) $(SRC)\botl.c $(HACK_H) $(O)cmd.B: $(PCHB) $(SRC)\cmd.c $(HACK_H) $(FUNC_TAB_H) $(O)dbridge.B: $(PCHB) $(SRC)\dbridge.c $(HACK_H) -$(O)do.B: $(PCHB) $(SRC)\do.c $(HACK_H) $(LEV_H) +$(O)do.B: $(PCHB) $(SRC)\do.c $(HACK_H) $(O)do_name.B: $(PCHB) $(SRC)\do_name.c $(HACK_H) $(O)do_wear.B: $(PCHB) $(SRC)\do_wear.c $(HACK_H) $(O)dog.B: $(PCHB) $(SRC)\dog.c $(HACK_H) $(O)dogmove.B: $(PCHB) $(SRC)\dogmove.c $(HACK_H) $(MFNDPOS_H) $(O)eat.B: $(PCHB) $(SRC)\eat.c $(HACK_H) -$(O)engrave.B: $(PCHB) $(SRC)\engrave.c $(HACK_H) $(LEV_H) +$(O)engrave.B: $(PCHB) $(SRC)\engrave.c $(HACK_H) $(O)hack.B: $(PCHB) $(SRC)\hack.c $(HACK_H) $(O)hacklib.B: $(PCHB) $(SRC)\hacklib.c $(HACK_H) $(O)invent.B: $(PCHB) $(SRC)\invent.c $(HACK_H) $(ARTIFACT_H) @@ -2060,7 +2059,7 @@ $(O)shk.B: $(PCHB) $(SRC)\shk.c $(HACK_H) $(O)shknam.B: $(PCHB) $(SRC)\shknam.c $(HACK_H) $(O)sounds.B: $(PCHB) $(SRC)\sounds.c $(HACK_H) $(O)steal.B: $(PCHB) $(SRC)\steal.c $(HACK_H) -$(O)timeout.B: $(PCHB) $(SRC)\timeout.c $(HACK_H) $(LEV_H) +$(O)timeout.B: $(PCHB) $(SRC)\timeout.c $(HACK_H) $(O)track.B: $(PCHB) $(SRC)\track.c $(HACK_H) $(O)trap.B: $(PCHB) $(SRC)\trap.c $(HACK_H) $(O)vault.B: $(PCHB) $(SRC)\vault.c $(HACK_H) diff --git a/sys/msdos/Makefile.GCC b/sys/msdos/Makefile.GCC index b924f8019..cfe9b28d3 100644 --- a/sys/msdos/Makefile.GCC +++ b/sys/msdos/Makefile.GCC @@ -1398,7 +1398,7 @@ $(O)apply.o: apply.c $(HACK_H) $(O)artifact.o: artifact.c $(HACK_H) $(INCL)/artifact.h $(INCL)/artilist.h $(O)attrib.o: attrib.c $(HACK_H) $(O)ball.o: ball.c $(HACK_H) -$(O)bones.o: bones.c $(HACK_H) $(INCL)/lev.h +$(O)bones.o: bones.c $(HACK_H) $(O)botl.o: botl.c $(HACK_H) $(O)cmd.o: cmd.c $(HACK_H) $(INCL)/func_tab.h $(O)dbridge.o: dbridge.c $(HACK_H) @@ -1408,7 +1408,7 @@ $(O)dig.o: dig.c $(HACK_H) $(O)display.o: display.c $(HACK_H) $(O)dlb.o: dlb.c $(CONFIG_H) $(INCL)/dlb.h $(CC) $(cflags) -I../sys/msdos -o$@ dlb.c -$(O)do.o: do.c $(HACK_H) $(INCL)/lev.h +$(O)do.o: do.c $(HACK_H) $(O)do_name.o: do_name.c $(HACK_H) $(O)do_wear.o: do_wear.c $(HACK_H) $(O)dog.o: dog.c $(HACK_H) @@ -1418,8 +1418,8 @@ $(O)dothrow.o: dothrow.c $(HACK_H) $(O)drawing.o: drawing.c $(HACK_H) $(INCL)/tcap.h $(O)dungeon.o: dungeon.c $(HACK_H) $(INCL)/dgn_file.h $(INCL)/dlb.h $(O)eat.o: eat.c $(HACK_H) -$(O)end.o: end.c $(HACK_H) $(INCL)/lev.h $(INCL)/dlb.h -$(O)engrave.o: engrave.c $(HACK_H) $(INCL)/lev.h +$(O)end.o: end.c $(HACK_H) $(INCL)/dlb.h +$(O)engrave.o: engrave.c $(HACK_H) $(O)exper.o: exper.c $(HACK_H) $(O)explode.o: explode.c $(HACK_H) $(O)extralev.o: extralev.c $(HACK_H) @@ -1428,7 +1428,7 @@ $(O)fountain.o: fountain.c $(HACK_H) $(O)hack.o: hack.c $(HACK_H) $(O)hacklib.o: hacklib.c $(HACK_H) $(O)invent.o: invent.c $(HACK_H) -$(O)light.o: light.c $(HACK_H) $(INCL)/lev.h +$(O)light.o: light.c $(HACK_H) $(O)lock.o: lock.c $(HACK_H) $(O)mail.o: mail.c $(HACK_H) $(INCL)/mail.h $(O)makemon.o: makemon.c $(HACK_H) @@ -1439,7 +1439,7 @@ $(O)mhitu.o: mhitu.c $(HACK_H) $(INCL)/artifact.h $(O)minion.o: minion.c $(HACK_H) $(O)mklev.o: mklev.c $(HACK_H) $(O)mkmap.o: mkmap.c $(HACK_H) $(INCL)/sp_lev.h -$(O)mkmaze.o: mkmaze.c $(HACK_H) $(INCL)/sp_lev.h $(INCL)/lev.h +$(O)mkmaze.o: mkmaze.c $(HACK_H) $(INCL)/sp_lev.h $(O)mkobj.o: mkobj.c $(HACK_H) $(O)mkroom.o: mkroom.c $(HACK_H) $(O)mon.o: mon.c $(HACK_H) $(INCL)/mfndpos.h @@ -1455,7 +1455,7 @@ $(O)music.o: music.c $(HACK_H) #interp.c $(O)nhlua.o: nhlua.c $(HACK_H) $(O)nhlsel.o: nhlsel.c $(HACK_H) $(O)nhlobj.o: nhlobj.c $(HACK_H) -$(O)o_init.o: o_init.c $(HACK_H) $(INCL)/lev.h +$(O)o_init.o: o_init.c $(HACK_H) $(O)objects.o: objects.c $(CONFIG_H) $(INCL)/obj.h $(INCL)/objclass.h \ $(INCL)/prop.h $(INCL)/skills.h $(INCL)/color.h $(O)objnam.o: objnam.c $(HACK_H) @@ -1472,13 +1472,13 @@ $(O)quest.o: quest.c $(HACK_H) $(O)questpgr.o: questpgr.c $(HACK_H) $(INCL)/dlb.h $(O)read.o: read.c $(HACK_H) $(O)rect.o: rect.c $(HACK_H) -$(O)region.o: region.c $(HACK_H) $(INCL)/lev.h -$(O)restore.o: restore.c $(HACK_H) $(INCL)/lev.h $(INCL)/tcap.h +$(O)region.o: region.c $(HACK_H) +$(O)restore.o: restore.c $(HACK_H) $(INCL)/tcap.h $(O)rip.o: rip.c $(HACK_H) $(O)rnd.o: rnd.c $(HACK_H) $(O)role.o: role.c $(HACK_H) -$(O)rumors.o: rumors.c $(HACK_H) $(INCL)/lev.h $(INCL)/dlb.h -$(O)save.o: save.c $(HACK_H) $(INCL)/lev.h +$(O)rumors.o: rumors.c $(HACK_H) $(INCL)/dlb.h +$(O)save.o: save.c $(HACK_H) $(O)shk.o: shk.c $(HACK_H) $(O)shknam.o: shknam.c $(HACK_H) $(O)sit.o: sit.c $(HACK_H) $(INCL)/artifact.h @@ -1489,7 +1489,7 @@ $(O)steal.o: steal.c $(HACK_H) $(O)steed.o: steed.c $(HACK_H) $(O)sys.o: sys.c $(HACK_H) $(O)teleport.o: teleport.c $(HACK_H) -$(O)timeout.o: timeout.c $(HACK_H) $(INCL)/lev.h +$(O)timeout.o: timeout.c $(HACK_H) $(O)topten.o: topten.c $(HACK_H) $(INCL)/dlb.h $(PATCHLEV_H) $(O)track.o: track.c $(HACK_H) $(O)trap.o: trap.c $(HACK_H) @@ -1503,7 +1503,7 @@ $(O)were.o: were.c $(HACK_H) $(O)wield.o: wield.c $(HACK_H) $(O)windows.o: windows.c $(HACK_H) $(INCL)/wingem.h $(INCL)/winGnome.h $(O)wizard.o: wizard.c $(HACK_H) -$(O)worm.o: worm.c $(HACK_H) $(INCL)/lev.h +$(O)worm.o: worm.c $(HACK_H) $(O)worn.o: worn.c $(HACK_H) $(O)write.o: write.c $(HACK_H) $(O)zap.o: zap.c $(HACK_H) diff --git a/sys/msdos/Makefile.MSC b/sys/msdos/Makefile.MSC index 90c9462d6..60ef58d9d 100644 --- a/sys/msdos/Makefile.MSC +++ b/sys/msdos/Makefile.MSC @@ -1114,7 +1114,7 @@ apply.o: apply.c $(HACK_H) artifact.o: artifact.c $(HACK_H) $(INCL)\artifact.h $(INCL)\artilist.h attrib.o: attrib.c $(HACK_H) $(INCL)\artifact.h ball.o: ball.c $(HACK_H) -bones.o: bones.c $(HACK_H) $(INCL)\lev.h +bones.o: bones.c $(HACK_H) botl.o: botl.c $(HACK_H) cmd.o: cmd.c $(HACK_H) $(INCL)\func_tab.h dbridge.o: dbridge.c $(HACK_H) @@ -1123,7 +1123,7 @@ detect.o: detect.c $(HACK_H) $(INCL)\artifact.h dig.o: dig.c $(HACK_H) display.o: display.c $(HACK_H) dlb.o: dlb.c $(CONFIG_H) $(INCL)\dlb.h -do.o: do.c $(HACK_H) $(INCL)\lev.h +do.o: do.c $(HACK_H) do_name.o: do_name.c $(HACK_H) do_wear.o: do_wear.c $(HACK_H) dog.o: dog.c $(HACK_H) @@ -1133,8 +1133,8 @@ dothrow.o: dothrow.c $(HACK_H) drawing.o: drawing.c $(HACK_H) $(INCL)\tcap.h dungeon.o: dungeon.c $(HACK_H) $(INCL)\dgn_file.h $(INCL)\dlb.h eat.o: eat.c $(HACK_H) -end.o: end.c $(HACK_H) $(INCL)\lev.h $(INCL)\dlb.h -engrave.o: engrave.c $(HACK_H) $(INCL)\lev.h +end.o: end.c $(HACK_H) $(INCL)\dlb.h +engrave.o: engrave.c $(HACK_H) exper.o: exper.c $(HACK_H) explode.o: explode.c $(HACK_H) extralev.o: extralev.c $(HACK_H) @@ -1143,7 +1143,7 @@ fountain.o: fountain.c $(HACK_H) hack.o: hack.c $(HACK_H) hacklib.o: hacklib.c $(HACK_H) invent.o: invent.c $(HACK_H) $(INCL)\artifact.h -light.o: light.c $(HACK_H) $(INCL)\lev.h +light.o: light.c $(HACK_H) lock.o: lock.c $(HACK_H) mail.o: mail.c $(HACK_H) $(INCL)\mail.h makemon.o: makemon.c $(HACK_H) @@ -1154,7 +1154,7 @@ mhitu.o: mhitu.c $(HACK_H) $(INCL)\artifact.h minion.o: minion.c $(HACK_H) mklev.o: mklev.c $(HACK_H) mkmap.o: mkmap.c $(HACK_H) $(INCL)\sp_lev.h -mkmaze.o: mkmaze.c $(HACK_H) $(INCL)\sp_lev.h $(INCL)\lev.h +mkmaze.o: mkmaze.c $(HACK_H) $(INCL)\sp_lev.h mkobj.o: mkobj.c $(HACK_H) $(INCL)\artifact.h mkroom.o: mkroom.c $(HACK_H) mon.o: mon.c $(HACK_H) $(INCL)\mfndpos.h @@ -1167,7 +1167,7 @@ mplayer.o: mplayer.c $(HACK_H) mthrowu.o: mthrowu.c $(HACK_H) muse.o: muse.c $(HACK_H) music.o: music.c $(HACK_H) #interp.c -o_init.o: o_init.c $(HACK_H) $(INCL)\lev.h +o_init.o: o_init.c $(HACK_H) objects.o: objects.c $(CONFIG_H) $(INCL)\obj.h $(INCL)\objclass.h \ $(INCL)\prop.h $(INCL)\skills.h $(INCL)\color.h objnam.o: objnam.c $(HACK_H) @@ -1186,12 +1186,12 @@ questpgr.o: questpgr.c $(HACK_H) $(INCL)\dlb.h read.o: read.c $(HACK_H) rect.o: rect.c $(HACK_H) region.o: region.c $(HACK_H) -restore.o: restore.c $(HACK_H) $(INCL)\lev.h $(INCL)\tcap.h +restore.o: restore.c $(HACK_H) $(INCL)\tcap.h rip.o: rip.c $(HACK_H) rnd.o: rnd.c $(HACK_H) role.o: role.c $(HACK_H) -rumors.o: rumors.c $(HACK_H) $(INCL)\lev.h $(INCL)\dlb.h -save.o: save.c $(HACK_H) $(INCL)\lev.h +rumors.o: rumors.c $(HACK_H) $(INCL)\dlb.h +save.o: save.c $(HACK_H) shk.o: shk.c $(HACK_H) shknam.o: shknam.c $(HACK_H) sit.o: sit.c $(HACK_H) $(INCL)\artifact.h @@ -1202,7 +1202,7 @@ steal.o: steal.c $(HACK_H) steed.o: steed.c $(HACK_H) sys.o: sys.c $(HACK_H) teleport.o: teleport.c $(HACK_H) -timeout.o: timeout.c $(HACK_H) $(INCL)\lev.h +timeout.o: timeout.c $(HACK_H) topten.o: topten.c $(HACK_H) $(INCL)\dlb.h $(INCL)\patchlev.h track.o: track.c $(HACK_H) trap.o: trap.c $(HACK_H) @@ -1216,7 +1216,7 @@ were.o: were.c $(HACK_H) wield.o: wield.c $(HACK_H) windows.o: windows.c $(HACK_H) $(INCL)\wingem.h wizard.o: wizard.c $(HACK_H) -worm.o: worm.c $(HACK_H) $(INCL)\lev.h +worm.o: worm.c $(HACK_H) worn.o: worn.c $(HACK_H) write.o: write.c $(HACK_H) zap.o: zap.c $(HACK_H) diff --git a/sys/msdos/Makefile2.cross b/sys/msdos/Makefile2.cross index 978c013a3..0b42d58fa 100644 --- a/sys/msdos/Makefile2.cross +++ b/sys/msdos/Makefile2.cross @@ -1052,7 +1052,7 @@ $(O)apply.o: apply.c $(HACK_H) $(O)artifact.o: artifact.c $(HACK_H) $(INCL)/artifact.h $(INCL)/artilist.h $(O)attrib.o: attrib.c $(HACK_H) $(O)ball.o: ball.c $(HACK_H) -$(O)bones.o: bones.c $(HACK_H) $(INCL)/lev.h +$(O)bones.o: bones.c $(HACK_H) $(O)botl.o: botl.c $(HACK_H) $(O)cmd.o: cmd.c $(HACK_H) $(INCL)/func_tab.h $(O)dbridge.o: dbridge.c $(HACK_H) @@ -1062,7 +1062,7 @@ $(O)dig.o: dig.c $(HACK_H) $(O)display.o: display.c $(HACK_H) $(O)dlb.o: dlb.c $(CONFIG_H) $(INCL)/dlb.h $(TARGET_CC) $(cflags) -I../sys/msdos -o$@ dlb.c -$(O)do.o: do.c $(HACK_H) $(INCL)/lev.h +$(O)do.o: do.c $(HACK_H) $(O)do_name.o: do_name.c $(HACK_H) $(O)do_wear.o: do_wear.c $(HACK_H) $(O)dog.o: dog.c $(HACK_H) @@ -1072,8 +1072,8 @@ $(O)dothrow.o: dothrow.c $(HACK_H) $(O)drawing.o: drawing.c $(HACK_H) $(INCL)/tcap.h $(O)dungeon.o: dungeon.c $(HACK_H) $(INCL)/dgn_file.h $(INCL)/dlb.h $(O)eat.o: eat.c $(HACK_H) -$(O)end.o: end.c $(HACK_H) $(INCL)/lev.h $(INCL)/dlb.h -$(O)engrave.o: engrave.c $(HACK_H) $(INCL)/lev.h +$(O)end.o: end.c $(HACK_H) $(INCL)/dlb.h +$(O)engrave.o: engrave.c $(HACK_H) $(O)exper.o: exper.c $(HACK_H) $(O)explode.o: explode.c $(HACK_H) $(O)extralev.o: extralev.c $(HACK_H) @@ -1082,7 +1082,7 @@ $(O)fountain.o: fountain.c $(HACK_H) $(O)hack.o: hack.c $(HACK_H) $(O)hacklib.o: hacklib.c $(HACK_H) $(O)invent.o: invent.c $(HACK_H) -$(O)light.o: light.c $(HACK_H) $(INCL)/lev.h +$(O)light.o: light.c $(HACK_H) $(O)lock.o: lock.c $(HACK_H) $(O)mail.o: mail.c $(HACK_H) $(INCL)/mail.h $(O)makemon.o: makemon.c $(HACK_H) @@ -1093,7 +1093,7 @@ $(O)mhitu.o: mhitu.c $(HACK_H) $(INCL)/artifact.h $(O)minion.o: minion.c $(HACK_H) $(O)mklev.o: mklev.c $(HACK_H) $(O)mkmap.o: mkmap.c $(HACK_H) $(INCL)/sp_lev.h -$(O)mkmaze.o: mkmaze.c $(HACK_H) $(INCL)/sp_lev.h $(INCL)/lev.h +$(O)mkmaze.o: mkmaze.c $(HACK_H) $(INCL)/sp_lev.h $(O)mkobj.o: mkobj.c $(HACK_H) $(O)mkroom.o: mkroom.c $(HACK_H) $(O)mon.o: mon.c $(HACK_H) $(INCL)/mfndpos.h @@ -1106,7 +1106,7 @@ $(O)mplayer.o: mplayer.c $(HACK_H) $(O)mthrowu.o: mthrowu.c $(HACK_H) $(O)muse.o: muse.c $(HACK_H) $(O)music.o: music.c $(HACK_H) #interp.c -$(O)o_init.o: o_init.c $(HACK_H) $(INCL)/lev.h +$(O)o_init.o: o_init.c $(HACK_H) $(O)objects.o: objects.c $(CONFIG_H) $(INCL)/obj.h $(INCL)/objclass.h \ $(INCL)/prop.h $(INCL)/skills.h $(INCL)/color.h $(O)objnam.o: objnam.c $(HACK_H) @@ -1123,13 +1123,13 @@ $(O)quest.o: quest.c $(HACK_H) $(O)questpgr.o: questpgr.c $(HACK_H) $(INCL)/dlb.h $(O)read.o: read.c $(HACK_H) $(O)rect.o: rect.c $(HACK_H) -$(O)region.o: region.c $(HACK_H) $(INCL)/lev.h -$(O)restore.o: restore.c $(HACK_H) $(INCL)/lev.h $(INCL)/tcap.h +$(O)region.o: region.c $(HACK_H) +$(O)restore.o: restore.c $(HACK_H) $(INCL)/tcap.h $(O)rip.o: rip.c $(HACK_H) $(O)rnd.o: rnd.c $(HACK_H) $(O)role.o: role.c $(HACK_H) -$(O)rumors.o: rumors.c $(HACK_H) $(INCL)/lev.h $(INCL)/dlb.h -$(O)save.o: save.c $(HACK_H) $(INCL)/lev.h +$(O)rumors.o: rumors.c $(HACK_H) $(INCL)/dlb.h +$(O)save.o: save.c $(HACK_H) $(O)shk.o: shk.c $(HACK_H) $(O)shknam.o: shknam.c $(HACK_H) $(O)sit.o: sit.c $(HACK_H) $(INCL)/artifact.h @@ -1140,7 +1140,7 @@ $(O)steal.o: steal.c $(HACK_H) $(O)steed.o: steed.c $(HACK_H) $(O)sys.o: sys.c $(HACK_H) $(O)teleport.o: teleport.c $(HACK_H) -$(O)timeout.o: timeout.c $(HACK_H) $(INCL)/lev.h +$(O)timeout.o: timeout.c $(HACK_H) $(O)topten.o: topten.c $(HACK_H) $(INCL)/dlb.h $(PATCHLEV_H) $(O)track.o: track.c $(HACK_H) $(O)trap.o: trap.c $(HACK_H) @@ -1154,7 +1154,7 @@ $(O)were.o: were.c $(HACK_H) $(O)wield.o: wield.c $(HACK_H) $(O)windows.o: windows.c $(HACK_H) $(INCL)/wingem.h $(INCL)/winGnome.h $(O)wizard.o: wizard.c $(HACK_H) -$(O)worm.o: worm.c $(HACK_H) $(INCL)/lev.h +$(O)worm.o: worm.c $(HACK_H) $(O)worn.o: worn.c $(HACK_H) $(O)write.o: write.c $(HACK_H) $(O)zap.o: zap.c $(HACK_H) diff --git a/sys/os2/Makefile.os2 b/sys/os2/Makefile.os2 index 2c1045a4c..545c91b87 100644 --- a/sys/os2/Makefile.os2 +++ b/sys/os2/Makefile.os2 @@ -1519,7 +1519,7 @@ $(OBJ)\attrib.o : $(SRC)\$(CB) $(HACK_H) $(INCL)\artifact.h $(SRCCC) $(OBJ)\ball.o : $(SRC)\$(CB) $(HACK_H) $(SRCCC) -$(OBJ)\bones.o : $(SRC)\$(CB) $(HACK_H) $(INCL)\lev.h +$(OBJ)\bones.o : $(SRC)\$(CB) $(HACK_H) $(SRCCC) $(OBJ)\botl.o : $(SRC)\$(CB) $(HACK_H) $(SRCCC) @@ -1537,7 +1537,7 @@ $(OBJ)\display.o : $(SRC)\$(CB) $(HACK_H) $(SRCCC) $(OBJ)\dlb.o : $(SRC)\$(CB) $(CONFIG_H) $(INCL)\dlb.h $(SRCCC) -$(OBJ)\do.o : $(SRC)\$(CB) $(HACK_H) $(INCL)\lev.h +$(OBJ)\do.o : $(SRC)\$(CB) $(HACK_H) $(SRCCC) $(OBJ)\do_name.o : $(SRC)\$(CB) $(HACK_H) $(SRCCC) @@ -1557,9 +1557,9 @@ $(OBJ)\dungeon.o : $(SRC)\$(CB) $(HACK_H) $(INCL)\dgn_file.h $(SRCCC) $(OBJ)\eat.o : $(SRC)\$(CB) $(HACK_H) $(SRCCC) -$(OBJ)\end.o : $(SRC)\$(CB) $(HACK_H) $(INCL)\lev.h +$(OBJ)\end.o : $(SRC)\$(CB) $(HACK_H) $(SRCCC) -$(OBJ)\engrave.o : $(SRC)\$(CB) $(HACK_H) $(INCL)\lev.h +$(OBJ)\engrave.o : $(SRC)\$(CB) $(HACK_H) $(SRCCC) $(OBJ)\exper.o : $(SRC)\$(CB) $(HACK_H) $(SRCCC) @@ -1653,7 +1653,7 @@ $(OBJ)\region.o : $(SRC)\$(CB) $(HACK_H) $(SRCCC) $(OBJ)\rect.o : $(SRC)\$(CB) $(HACK_H) $(SRCCC) -$(OBJ)\restore.o : $(SRC)\$(CB) $(HACK_H) $(INCL)\lev.h $(INCL)\tcap.h $(INCL)\quest.h +$(OBJ)\restore.o : $(SRC)\$(CB) $(HACK_H) $(INCL)\tcap.h $(INCL)\quest.h $(SRCCC) $(OBJ)\rip.o : $(SRC)\$(CB) $(HACK_H) $(SRCCC) @@ -1663,7 +1663,7 @@ $(OBJ)\role.o : $(SRC)\$(CB) $(HACK_H) $(SRCCC) $(OBJ)\rumors.o : $(SRC)\$(CB) $(HACK_H) $(SRCCC) -$(OBJ)\save.o : $(SRC)\$(CB) $(HACK_H) $(INCL)\lev.h $(INCL)\quest.h +$(OBJ)\save.o : $(SRC)\$(CB) $(HACK_H) $(INCL)\quest.h $(SRCCC) $(OBJ)\shk.o : $(SRC)\$(CB) $(HACK_H) $(SRCCC) @@ -1713,7 +1713,7 @@ $(OBJ)\windows.o : $(SRC)\$(CB) $(HACK_H) $(SRCCC) $(OBJ)\wizard.o : $(SRC)\$(CB) $(HACK_H) $(SRCCC) -$(OBJ)\worm.o : $(SRC)\$(CB) $(HACK_H) $(INCL)\lev.h +$(OBJ)\worm.o : $(SRC)\$(CB) $(HACK_H) $(SRCCC) $(OBJ)\worn.o : $(SRC)\$(CB) $(HACK_H) $(SRCCC) diff --git a/sys/unix/Makefile.src b/sys/unix/Makefile.src index 9f981a72b..7af0bba60 100644 --- a/sys/unix/Makefile.src +++ b/sys/unix/Makefile.src @@ -495,7 +495,7 @@ CSOURCES = $(HACKCSRC) $(SYSCSRC) $(WINCSRC) $(CHAINSRC) $(GENCSRC) HACKINCL = align.h amiconf.h artifact.h artilist.h attrib.h beconf.h botl.h \ color.h config.h config1.h context.h coord.h decl.h def_os2.h \ display.h dlb.h dungeon.h engrave.h extern.h flag.h func_tab.h \ - global.h hack.h lev.h lint.h macconf.h mextra.h mfndpos.h micro.h \ + global.h hack.h lint.h macconf.h mextra.h mfndpos.h micro.h \ mkroom.h \ monattk.h mondata.h monflag.h monst.h monsym.h obj.h objclass.h \ os2conf.h patchlevel.h pcconf.h permonst.h prop.h rect.h region.h \ @@ -1044,16 +1044,16 @@ apply.o: apply.c $(HACK_H) artifact.o: artifact.c $(HACK_H) ../include/artifact.h ../include/artilist.h attrib.o: attrib.c $(HACK_H) ball.o: ball.c $(HACK_H) -bones.o: bones.c $(HACK_H) ../include/lev.h +bones.o: bones.c $(HACK_H) botl.o: botl.c $(HACK_H) -cmd.o: cmd.c $(HACK_H) ../include/lev.h ../include/func_tab.h +cmd.o: cmd.c $(HACK_H) ../include/func_tab.h dbridge.o: dbridge.c $(HACK_H) decl.o: decl.c $(HACK_H) detect.o: detect.c $(HACK_H) ../include/artifact.h dig.o: dig.c $(HACK_H) display.o: display.c $(HACK_H) dlb.o: dlb.c $(CONFIG_H) ../include/dlb.h ../include/patchlevel.h -do.o: do.c $(HACK_H) ../include/lev.h +do.o: do.c $(HACK_H) do_name.o: do_name.c $(HACK_H) do_wear.o: do_wear.c $(HACK_H) dog.o: dog.c $(HACK_H) @@ -1061,21 +1061,20 @@ dogmove.o: dogmove.c $(HACK_H) ../include/mfndpos.h dokick.o: dokick.c $(HACK_H) dothrow.o: dothrow.c $(HACK_H) drawing.o: drawing.c $(HACK_H) ../include/tcap.h -dungeon.o: dungeon.c $(HACK_H) ../include/dgn_file.h ../include/dlb.h \ - ../include/lev.h +dungeon.o: dungeon.c $(HACK_H) ../include/dgn_file.h ../include/dlb.h eat.o: eat.c $(HACK_H) -end.o: end.c $(HACK_H) ../include/lev.h ../include/dlb.h -engrave.o: engrave.c $(HACK_H) ../include/lev.h +end.o: end.c $(HACK_H) ../include/dlb.h +engrave.o: engrave.c $(HACK_H) exper.o: exper.c $(HACK_H) explode.o: explode.c $(HACK_H) extralev.o: extralev.c $(HACK_H) -files.o: files.c $(HACK_H) ../include/dlb.h ../include/lev.h #zlib.h +files.o: files.c $(HACK_H) ../include/dlb.h #zlib.h fountain.o: fountain.c $(HACK_H) hack.o: hack.c $(HACK_H) hacklib.o: hacklib.c $(HACK_H) invent.o: invent.c $(HACK_H) isaac64.o: isaac64.c $(CONFIG_H) ../include/isaac64.h -light.o: light.c $(HACK_H) ../include/lev.h +light.o: light.c $(HACK_H) lock.o: lock.c $(HACK_H) mail.o: mail.c $(HACK_H) ../include/mail.h makemon.o: makemon.c $(HACK_H) @@ -1094,7 +1093,7 @@ mhitu.o: mhitu.c $(HACK_H) ../include/artifact.h minion.o: minion.c $(HACK_H) mklev.o: mklev.c $(HACK_H) mkmap.o: mkmap.c $(HACK_H) ../include/sp_lev.h -mkmaze.o: mkmaze.c $(HACK_H) ../include/sp_lev.h ../include/lev.h +mkmaze.o: mkmaze.c $(HACK_H) ../include/sp_lev.h mkobj.o: mkobj.c $(HACK_H) mkroom.o: mkroom.c $(HACK_H) mon.o: mon.c $(HACK_H) ../include/mfndpos.h @@ -1109,7 +1108,7 @@ muse.o: muse.c $(HACK_H) music.o: music.c $(HACK_H) nhlua.o: nhlua.c $(HACK_H) ../include/dlb.h nhlsel.o: nhlsel.c $(HACK_H) ../include/sp_lev.h -o_init.o: o_init.c $(HACK_H) ../include/lev.h +o_init.o: o_init.c $(HACK_H) objects.o: objects.c $(CONFIG_H) ../include/obj.h ../include/objclass.h \ ../include/prop.h ../include/skills.h ../include/color.h objnam.o: objnam.c $(HACK_H) @@ -1126,13 +1125,13 @@ quest.o: quest.c $(HACK_H) questpgr.o: questpgr.c $(HACK_H) ../include/dlb.h read.o: read.c $(HACK_H) rect.o: rect.c $(HACK_H) -region.o: region.c $(HACK_H) ../include/lev.h -restore.o: restore.c $(HACK_H) ../include/lev.h ../include/tcap.h +region.o: region.c $(HACK_H) +restore.o: restore.c $(HACK_H) ../include/tcap.h rip.o: rip.c $(HACK_H) rnd.o: rnd.c $(HACK_H) ../include/isaac64.h role.o: role.c $(HACK_H) -rumors.o: rumors.c $(HACK_H) ../include/lev.h ../include/dlb.h -save.o: save.c $(HACK_H) ../include/lev.h +rumors.o: rumors.c $(HACK_H) ../include/dlb.h +save.o: save.c $(HACK_H) sfstruct.o: sfstruct.c $(HACK_H) shk.o: shk.c $(HACK_H) shknam.o: shknam.c $(HACK_H) @@ -1144,7 +1143,7 @@ steal.o: steal.c $(HACK_H) steed.o: steed.c $(HACK_H) sys.o: sys.c $(HACK_H) teleport.o: teleport.c $(HACK_H) -timeout.o: timeout.c $(HACK_H) ../include/lev.h +timeout.o: timeout.c $(HACK_H) topten.o: topten.c $(HACK_H) ../include/dlb.h ../include/patchlevel.h track.o: track.c $(HACK_H) trap.o: trap.c $(HACK_H) @@ -1152,14 +1151,14 @@ u_init.o: u_init.c $(HACK_H) uhitm.o: uhitm.c $(HACK_H) vault.o: vault.c $(HACK_H) version.o: version.c $(HACK_H) ../include/dlb.h ../include/date.h \ - ../include/lev.h ../include/patchlevel.h + ../include/patchlevel.h vision.o: vision.c $(HACK_H) ../include/vis_tab.h weapon.o: weapon.c $(HACK_H) were.o: were.c $(HACK_H) wield.o: wield.c $(HACK_H) windows.o: windows.c $(HACK_H) ../include/wingem.h ../include/winGnome.h wizard.o: wizard.c $(HACK_H) -worm.o: worm.c $(HACK_H) ../include/lev.h +worm.o: worm.c $(HACK_H) worn.o: worn.c $(HACK_H) write.o: write.c $(HACK_H) zap.o: zap.c $(HACK_H) diff --git a/sys/unix/NetHack.xcodeproj/project.pbxproj b/sys/unix/NetHack.xcodeproj/project.pbxproj index f0088d4fd..c09de805f 100644 --- a/sys/unix/NetHack.xcodeproj/project.pbxproj +++ b/sys/unix/NetHack.xcodeproj/project.pbxproj @@ -327,7 +327,6 @@ 3186A3CC21A4B0FE0052BF02 /* gem_rsc.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = gem_rsc.h; path = ../../include/gem_rsc.h; sourceTree = ""; }; 3186A3CD21A4B0FE0052BF02 /* trap.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = trap.h; path = ../../include/trap.h; sourceTree = ""; }; 3186A3CE21A4B0FE0052BF02 /* winGnome.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = winGnome.h; path = ../../include/winGnome.h; sourceTree = ""; }; - 3186A3CF21A4B0FE0052BF02 /* lev.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = lev.h; path = ../../include/lev.h; sourceTree = ""; }; 3186A3D021A4B0FE0052BF02 /* decl.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = decl.h; path = ../../include/decl.h; sourceTree = ""; }; 3186A3D321A4B14B0052BF02 /* cursstat.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = cursstat.h; path = ../../win/curses/cursstat.h; sourceTree = ""; }; 3186A3D421A4B14B0052BF02 /* cursdial.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = cursdial.h; path = ../../win/curses/cursdial.h; sourceTree = ""; }; @@ -729,7 +728,6 @@ 3186A3A521A4B0FD0052BF02 /* hack.h */, 3186A37A21A4B0FA0052BF02 /* integer.h */, 3186A39021A4B0FC0052BF02 /* lev_comp.h */, - 3186A3CF21A4B0FE0052BF02 /* lev.h */, 3186A3BC21A4B0FD0052BF02 /* lint.h */, 3186A39921A4B0FD0052BF02 /* load_img.h */, 3186A3A421A4B0FD0052BF02 /* mac-carbon.h */, diff --git a/sys/vms/Makefile.src b/sys/vms/Makefile.src index 0908ba590..559f974c0 100644 --- a/sys/vms/Makefile.src +++ b/sys/vms/Makefile.src @@ -175,7 +175,7 @@ VERSOURCES = $(HACKCSRC) $(SYSSRC) $(WINSRC) $(RANDSRC) $(GENCSRC) HACKINCL = align.h amiconf.h artifact.h artilist.h attrib.h beconf.h color.h \ config.h config1.h context.h coord.h decl.h def_os2.h display.h \ dlb.h dungeon.h engrave.h extern.h flag.h func_tab.h global.h \ - hack.h lev.h macconf.h mextra.h mfndpos.h micro.h mkroom.h \ + hack.h macconf.h mextra.h mfndpos.h micro.h mkroom.h \ monattk.h mondata.h monflag.h monst.h monsym.h obj.h objclass.h \ os2conf.h patchlevel.h pcconf.h permonst.h prop.h rect.h \ region.h rm.h sp_lev.h spell.h sys.h system.h tcap.h timeout.h \ @@ -491,16 +491,16 @@ apply.obj : apply.c $(HACK_H) artifact.obj : artifact.c $(HACK_H) $(INC)artifact.h $(INC)artilist.h attrib.obj : attrib.c $(HACK_H) ball.obj : ball.c $(HACK_H) -bones.obj : bones.c $(HACK_H) $(INC)lev.h +bones.obj : bones.c $(HACK_H) botl.obj : botl.c $(HACK_H) -cmd.obj : cmd.c $(HACK_H) $(INC)lev.h $(INC)func_tab.h +cmd.obj : cmd.c $(HACK_H) $(INC)func_tab.h dbridge.obj : dbridge.c $(HACK_H) decl.obj : decl.c $(HACK_H) detect.obj : detect.c $(HACK_H) $(INC)artifact.h dig.obj : dig.c $(HACK_H) display.obj : display.c $(HACK_H) dlb.obj : dlb.c $(CONFIG_H) $(INC)dlb.h -do.obj : do.c $(HACK_H) $(INC)lev.h +do.obj : do.c $(HACK_H) do_name.obj : do_name.c $(HACK_H) do_wear.obj : do_wear.c $(HACK_H) dog.obj : dog.c $(HACK_H) @@ -508,10 +508,10 @@ dogmove.obj : dogmove.c $(HACK_H) $(INC)mfndpos.h dokick.obj : dokick.c $(HACK_H) dothrow.obj : dothrow.c $(HACK_H) drawing.obj : drawing.c $(HACK_H) $(INC)tcap.h -dungeon.obj : dungeon.c $(HACK_H) $(INC)dgn_file.h $(INC)dlb.h $(INC)lev.h +dungeon.obj : dungeon.c $(HACK_H) $(INC)dgn_file.h $(INC)dlb.h eat.obj : eat.c $(HACK_H) -end.obj : end.c $(HACK_H) $(INC)lev.h $(INC)dlb.h -engrave.obj : engrave.c $(HACK_H) $(INC)lev.h +end.obj : end.c $(HACK_H) $(INC)dlb.h +engrave.obj : engrave.c $(HACK_H) exper.obj : exper.c $(HACK_H) explode.obj : explode.c $(HACK_H) extralev.obj : extralev.c $(HACK_H) @@ -520,7 +520,7 @@ fountain.obj : fountain.c $(HACK_H) hack.obj : hack.c $(HACK_H) hacklib.obj : hacklib.c $(HACK_H) invent.obj : invent.c $(HACK_H) -light.obj : light.c $(HACK_H) $(INC)lev.h +light.obj : light.c $(HACK_H) lock.obj : lock.c $(HACK_H) mail.obj : mail.c $(HACK_H) $(INC)mail.h makemon.obj : makemon.c $(HACK_H) @@ -531,7 +531,7 @@ mhitu.obj : mhitu.c $(HACK_H) $(INC)artifact.h minion.obj : minion.c $(HACK_H) mklev.obj : mklev.c $(HACK_H) mkmap.obj : mkmap.c $(HACK_H) $(INC)sp_lev.h -mkmaze.obj : mkmaze.c $(HACK_H) $(INC)sp_lev.h $(INC)lev.h +mkmaze.obj : mkmaze.c $(HACK_H) $(INC)sp_lev.h mkobj.obj : mkobj.c $(HACK_H) mkroom.obj : mkroom.c $(HACK_H) mon.obj : mon.c $(HACK_H) $(INC)mfndpos.h @@ -544,7 +544,7 @@ mplayer.obj : mplayer.c $(HACK_H) mthrowu.obj : mthrowu.c $(HACK_H) muse.obj : muse.c $(HACK_H) music.obj : music.c $(HACK_H) #interp.c -o_init.obj : o_init.c $(HACK_H) $(INC)lev.h +o_init.obj : o_init.c $(HACK_H) objects.obj : objects.c $(CONFIG_H) $(INC)obj.h $(INC)objclass.h \ $(INC)prop.h $(INC)skills.h $(INC)color.h objnam.obj : objnam.c $(HACK_H) @@ -561,13 +561,13 @@ quest.obj : quest.c $(HACK_H) questpgr.obj : questpgr.c $(HACK_H) $(INC)dlb.h read.obj : read.c $(HACK_H) rect.obj : rect.c $(HACK_H) -region.obj : region.c $(HACK_H) $(INC)lev.h -restore.obj : restore.c $(HACK_H) $(INC)lev.h $(INC)tcap.h +region.obj : region.c $(HACK_H) +restore.obj : restore.c $(HACK_H) $(INC)tcap.h rip.obj : rip.c $(HACK_H) rnd.obj : rnd.c $(HACK_H) role.obj : role.c $(HACK_H) -rumors.obj : rumors.c $(HACK_H) $(INC)lev.h $(INC)dlb.h -save.obj : save.c $(HACK_H) $(INC)lev.h +rumors.obj : rumors.c $(HACK_H) $(INC)dlb.h +save.obj : save.c $(HACK_H) shk.obj : shk.c $(HACK_H) shknam.obj : shknam.c $(HACK_H) sit.obj : sit.c $(HACK_H) $(INC)artifact.h @@ -578,7 +578,7 @@ steal.obj : steal.c $(HACK_H) steed.obj : steed.c $(HACK_H) sys.obj : sys.c $(HACK_H) teleport.obj : teleport.c $(HACK_H) -timeout.obj : timeout.c $(HACK_H) $(INC)lev.h +timeout.obj : timeout.c $(HACK_H) topten.obj : topten.c $(HACK_H) $(INC)dlb.h $(INC)patchlevel.h track.obj : track.c $(HACK_H) trap.obj : trap.c $(HACK_H) @@ -592,7 +592,7 @@ were.obj : were.c $(HACK_H) wield.obj : wield.c $(HACK_H) windows.obj : windows.c $(HACK_H) $(INC)wingem.h $(INC)winGnome.h wizard.obj : wizard.c $(HACK_H) -worm.obj : worm.c $(HACK_H) $(INC)lev.h +worm.obj : worm.c $(HACK_H) worn.obj : worn.c $(HACK_H) write.obj : write.c $(HACK_H) zap.obj : zap.c $(HACK_H) diff --git a/sys/wince/bootstrp.mak b/sys/wince/bootstrp.mak index 7fe11616a..35cb62595 100644 --- a/sys/wince/bootstrp.mak +++ b/sys/wince/bootstrp.mak @@ -202,7 +202,6 @@ HACK_H = $(INCL)\hack.h $(CONFIG_H) $(INCL)\align.h \ $(INCL)\rect.h $(INCL)\region.h $(INCL)\winprocs.h \ $(INCL)\wintty.h $(INCL)\trampoli.h -LEV_H = $(INCL)\lev.h DGN_FILE_H = $(INCL)\dgn_file.h LEV_COMP_H = $(INCL)\lev_comp.h SP_LEV_H = $(INCL)\sp_lev.h @@ -768,7 +767,7 @@ $(O)apply.o: $(SRC)\apply.c $(HACK_H) $(O)artifact.o: $(SRC)\artifact.c $(HACK_H) $(INCL)\artifact.h $(INCL)\artilist.h $(O)attrib.o: $(SRC)\attrib.c $(HACK_H) $(INCL)\artifact.h $(O)ball.o: $(SRC)\ball.c $(HACK_H) -$(O)bones.o: $(SRC)\bones.c $(HACK_H) $(INCL)\lev.h +$(O)bones.o: $(SRC)\bones.c $(HACK_H) $(O)botl.o: $(SRC)\botl.c $(HACK_H) $(O)cmd.o: $(SRC)\cmd.c $(HACK_H) $(INCL)\func_tab.h $(O)dbridge.o: $(SRC)\dbridge.c $(HACK_H) @@ -777,7 +776,7 @@ $(O)detect.o: $(SRC)\detect.c $(HACK_H) $(INCL)\artifact.h $(O)dig.o: $(SRC)\dig.c $(HACK_H) $(O)display.o: $(SRC)\display.c $(HACK_H) $(O)dlb.o: $(SRC)\dlb.c $(CONFIG_H) $(INCL)\dlb.h -$(O)do.o: $(SRC)\do.c $(HACK_H) $(INCL)\lev.h +$(O)do.o: $(SRC)\do.c $(HACK_H) $(O)do_name.o: $(SRC)\do_name.c $(HACK_H) $(O)do_wear.o: $(SRC)\do_wear.c $(HACK_H) $(O)dog.o: $(SRC)\dog.c $(HACK_H) @@ -787,8 +786,8 @@ $(O)dothrow.o: $(SRC)\dothrow.c $(HACK_H) $(O)drawing.o: $(SRC)\drawing.c $(HACK_H) $(INCL)\tcap.h $(O)dungeon.o: $(SRC)\dungeon.c $(HACK_H) $(INCL)\dgn_file.h $(INCL)\dlb.h $(O)eat.o: $(SRC)\eat.c $(HACK_H) -$(O)end.o: $(SRC)\end.c $(HACK_H) $(INCL)\lev.h $(INCL)\dlb.h -$(O)engrave.o: $(SRC)\engrave.c $(HACK_H) $(INCL)\lev.h +$(O)end.o: $(SRC)\end.c $(HACK_H) $(INCL)\dlb.h +$(O)engrave.o: $(SRC)\engrave.c $(HACK_H) $(O)exper.o: $(SRC)\exper.c $(HACK_H) $(O)explode.o: $(SRC)\explode.c $(HACK_H) $(O)extralev.o: $(SRC)\extralev.c $(HACK_H) @@ -797,7 +796,7 @@ $(O)fountain.o: $(SRC)\fountain.c $(HACK_H) $(O)hack.o: $(SRC)\hack.c $(HACK_H) $(O)hacklib.o: $(SRC)\hacklib.c $(HACK_H) $(O)invent.o: $(SRC)\invent.c $(HACK_H) $(INCL)\artifact.h -$(O)light.o: $(SRC)\light.c $(HACK_H) $(INCL)\lev.h +$(O)light.o: $(SRC)\light.c $(HACK_H) $(O)lock.o: $(SRC)\lock.c $(HACK_H) $(O)mail.o: $(SRC)\mail.c $(HACK_H) $(INCL)\mail.h $(O)makemon.o: $(SRC)\makemon.c $(HACK_H) @@ -808,7 +807,7 @@ $(O)mhitu.o: $(SRC)\mhitu.c $(HACK_H) $(INCL)\artifact.h $(O)minion.o: $(SRC)\minion.c $(HACK_H) $(O)mklev.o: $(SRC)\mklev.c $(HACK_H) $(O)mkmap.o: $(SRC)\mkmap.c $(HACK_H) $(INCL)\sp_lev.h -$(O)mkmaze.o: $(SRC)\mkmaze.c $(HACK_H) $(INCL)\sp_lev.h $(INCL)\lev.h +$(O)mkmaze.o: $(SRC)\mkmaze.c $(HACK_H) $(INCL)\sp_lev.h $(O)mkobj.o: $(SRC)\mkobj.c $(HACK_H) $(INCL)\artifact.h $(O)mkroom.o: $(SRC)\mkroom.c $(HACK_H) $(O)mon.o: $(SRC)\mon.c $(HACK_H) $(INCL)\mfndpos.h @@ -821,7 +820,7 @@ $(O)mplayer.o: $(SRC)\mplayer.c $(HACK_H) $(O)mthrowu.o: $(SRC)\mthrowu.c $(HACK_H) $(O)muse.o: $(SRC)\muse.c $(HACK_H) $(O)music.o: $(SRC)\music.c $(HACK_H) #interp.c -$(O)o_init.o: $(SRC)\o_init.c $(HACK_H) $(INCL)\lev.h +$(O)o_init.o: $(SRC)\o_init.c $(HACK_H) $(O)objects.o: $(SRC)\objects.c $(CONFIG_H) $(INCL)\obj.h $(INCL)\objclass.h \ $(INCL)\prop.h $(INCL)\skills.h $(INCL)\color.h $(O)objnam.o: $(SRC)\objnam.c $(HACK_H) @@ -838,13 +837,13 @@ $(O)quest.o: $(SRC)\quest.c $(HACK_H) $(O)questpgr.o: $(SRC)\questpgr.c $(HACK_H) $(INCL)\dlb.h $(O)read.o: $(SRC)\read.c $(HACK_H) $(O)rect.o: $(SRC)\rect.c $(HACK_H) -$(O)region.o: $(SRC)\region.c $(HACK_H) $(INCL)\lev.h -$(O)restore.o: $(SRC)\restore.c $(HACK_H) $(INCL)\lev.h $(INCL)\tcap.h +$(O)region.o: $(SRC)\region.c $(HACK_H) +$(O)restore.o: $(SRC)\restore.c $(HACK_H) $(INCL)\tcap.h $(O)rip.o: $(SRC)\rip.c $(HACK_H) $(O)rnd.o: $(SRC)\rnd.c $(HACK_H) $(O)role.o: $(SRC)\role.c $(HACK_H) -$(O)rumors.o: $(SRC)\rumors.c $(HACK_H) $(INCL)\lev.h $(INCL)\dlb.h -$(O)save.o: $(SRC)\save.c $(HACK_H) $(INCL)\lev.h +$(O)rumors.o: $(SRC)\rumors.c $(HACK_H) $(INCL)\dlb.h +$(O)save.o: $(SRC)\save.c $(HACK_H) $(O)shk.o: $(SRC)\shk.c $(HACK_H) $(O)shknam.o: $(SRC)\shknam.c $(HACK_H) $(O)sit.o: $(SRC)\sit.c $(HACK_H) $(INCL)\artifact.h @@ -854,7 +853,7 @@ $(O)spell.o: $(SRC)\spell.c $(HACK_H) $(O)steal.o: $(SRC)\steal.c $(HACK_H) $(O)steed.o: $(SRC)\steed.c $(HACK_H) $(O)teleport.o: $(SRC)\teleport.c $(HACK_H) -$(O)timeout.o: $(SRC)\timeout.c $(HACK_H) $(INCL)\lev.h +$(O)timeout.o: $(SRC)\timeout.c $(HACK_H) $(O)topten.o: $(SRC)\topten.c $(HACK_H) $(INCL)\dlb.h $(INCL)\patchlevel.h $(O)track.o: $(SRC)\track.c $(HACK_H) $(O)trap.o: $(SRC)\trap.c $(HACK_H) @@ -868,7 +867,7 @@ $(O)were.o: $(SRC)\were.c $(HACK_H) $(O)wield.o: $(SRC)\wield.c $(HACK_H) $(O)windows.o: $(SRC)\windows.c $(HACK_H) $(INCL)\wingem.h $(INCL)\winGnome.h $(O)wizard.o: $(SRC)\wizard.c $(HACK_H) -$(O)worm.o: $(SRC)\worm.c $(HACK_H) $(INCL)\lev.h +$(O)worm.o: $(SRC)\worm.c $(HACK_H) $(O)worn.o: $(SRC)\worn.c $(HACK_H) $(O)write.o: $(SRC)\write.c $(HACK_H) $(O)zap.o: $(SRC)\zap.c $(HACK_H) diff --git a/sys/winnt/Makefile.gcc b/sys/winnt/Makefile.gcc index 5119d3eec..fbfd11000 100644 --- a/sys/winnt/Makefile.gcc +++ b/sys/winnt/Makefile.gcc @@ -491,7 +491,6 @@ HACK_H = $(INCL)/hack.h $(CONFIG_H) $(INCL)/align.h $(INCL)/context.h \ $(INCL)/rect.h $(INCL)/region.h $(INCL)/winprocs.h \ $(INCL)/wintty.h $(INCL)/sys.h $(INCL)/trampoli.h -LEV_H = $(INCL)/lev.h DGN_FILE_H = $(INCL)/dgn_file.h SP_LEV_H = $(INCL)/sp_lev.h TILE_H = ../win/share/tile.h @@ -1538,7 +1537,7 @@ $(O)apply.o: apply.c $(HACK_H) $(O)artifact.o: artifact.c $(HACK_H) $(INCL)/artifact.h $(INCL)/artilist.h $(O)attrib.o: attrib.c $(HACK_H) $(O)ball.o: ball.c $(HACK_H) -$(O)bones.o: bones.c $(HACK_H) $(INCL)/lev.h +$(O)bones.o: bones.c $(HACK_H) $(O)botl.o: botl.c $(HACK_H) $(O)cmd.o: cmd.c $(HACK_H) $(INCL)/func_tab.h $(O)dbridge.o: dbridge.c $(HACK_H) @@ -1547,7 +1546,7 @@ $(O)detect.o: detect.c $(HACK_H) $(INCL)/artifact.h $(O)dig.o: dig.c $(HACK_H) $(O)display.o: display.c $(HACK_H) $(O)dlb.o: dlb.c $(CONFIG_H) $(INCL)/dlb.h -$(O)do.o: do.c $(HACK_H) $(INCL)/lev.h +$(O)do.o: do.c $(HACK_H) $(O)do_name.o: do_name.c $(HACK_H) $(O)do_wear.o: do_wear.c $(HACK_H) $(O)dog.o: dog.c $(HACK_H) @@ -1557,8 +1556,8 @@ $(O)dothrow.o: dothrow.c $(HACK_H) $(O)drawing.o: drawing.c $(HACK_H) $(INCL)/tcap.h $(O)dungeon.o: dungeon.c $(HACK_H) $(INCL)/dgn_file.h $(INCL)/dlb.h $(O)eat.o: eat.c $(HACK_H) -$(O)end.o: end.c $(HACK_H) $(INCL)/lev.h $(INCL)/dlb.h -$(O)engrave.o: engrave.c $(HACK_H) $(INCL)/lev.h +$(O)end.o: end.c $(HACK_H) $(INCL)/dlb.h +$(O)engrave.o: engrave.c $(HACK_H) $(O)exper.o: exper.c $(HACK_H) $(O)explode.o: explode.c $(HACK_H) $(O)extralev.o: extralev.c $(HACK_H) @@ -1567,7 +1566,7 @@ $(O)fountain.o: fountain.c $(HACK_H) $(O)hack.o: hack.c $(HACK_H) $(O)hacklib.o: hacklib.c $(HACK_H) $(O)invent.o: invent.c $(HACK_H) -$(O)light.o: light.c $(HACK_H) $(INCL)/lev.h +$(O)light.o: light.c $(HACK_H) $(O)lock.o: lock.c $(HACK_H) $(O)mail.o: mail.c $(HACK_H) $(INCL)/mail.h $(O)makemon.o: makemon.c $(HACK_H) @@ -1578,7 +1577,7 @@ $(O)mhitu.o: mhitu.c $(HACK_H) $(INCL)/artifact.h $(O)minion.o: minion.c $(HACK_H) $(O)mklev.o: mklev.c $(HACK_H) $(O)mkmap.o: mkmap.c $(HACK_H) $(INCL)/sp_lev.h -$(O)mkmaze.o: mkmaze.c $(HACK_H) $(INCL)/sp_lev.h $(INCL)/lev.h +$(O)mkmaze.o: mkmaze.c $(HACK_H) $(INCL)/sp_lev.h $(O)mkobj.o: mkobj.c $(HACK_H) $(O)mkroom.o: mkroom.c $(HACK_H) $(O)mon.o: mon.c $(HACK_H) $(INCL)/mfndpos.h @@ -1594,7 +1593,7 @@ $(O)music.o: music.c $(HACK_H) #interp.c $(O)nhlua.o: nhlua.c $(HACK_H) $(O)nhlsel.o: nhlsel.c $(HACK_H) $(O)nhlobj.o: nhlobj.c $(HACK_H) -$(O)o_init.o: o_init.c $(HACK_H) $(INCL)/lev.h +$(O)o_init.o: o_init.c $(HACK_H) $(O)objects.o: objects.c $(CONFIG_H) $(INCL)/obj.h $(INCL)/objclass.h \ $(INCL)/prop.h $(INCL)/skills.h $(INCL)/color.h $(O)objnam.o: objnam.c $(HACK_H) @@ -1611,13 +1610,13 @@ $(O)quest.o: quest.c $(HACK_H) $(O)questpgr.o: questpgr.c $(HACK_H) $(INCL)/dlb.h $(O)read.o: read.c $(HACK_H) $(O)rect.o: rect.c $(HACK_H) -$(O)region.o: region.c $(HACK_H) $(INCL)/lev.h -$(O)restore.o: restore.c $(HACK_H) $(INCL)/lev.h $(INCL)/tcap.h +$(O)region.o: region.c $(HACK_H) +$(O)restore.o: restore.c $(HACK_H) $(INCL)/tcap.h $(O)rip.o: rip.c $(HACK_H) $(O)rnd.o: rnd.c $(HACK_H) $(O)role.o: role.c $(HACK_H) -$(O)rumors.o: rumors.c $(HACK_H) $(INCL)/lev.h $(INCL)/dlb.h -$(O)save.o: save.c $(HACK_H) $(INCL)/lev.h +$(O)rumors.o: rumors.c $(HACK_H) $(INCL)/dlb.h +$(O)save.o: save.c $(HACK_H) $(O)shk.o: shk.c $(HACK_H) $(O)shknam.o: shknam.c $(HACK_H) $(O)sit.o: sit.c $(HACK_H) $(INCL)/artifact.h @@ -1628,7 +1627,7 @@ $(O)steal.o: steal.c $(HACK_H) $(O)steed.o: steed.c $(HACK_H) $(O)sys.o: sys.c $(HACK_H) $(O)teleport.o: teleport.c $(HACK_H) -$(O)timeout.o: timeout.c $(HACK_H) $(INCL)/lev.h +$(O)timeout.o: timeout.c $(HACK_H) $(O)topten.o: topten.c $(HACK_H) $(INCL)/dlb.h $(INCL)/patchlevel.h $(O)track.o: track.c $(HACK_H) $(O)trap.o: trap.c $(HACK_H) @@ -1643,7 +1642,7 @@ $(O)wield.o: wield.c $(HACK_H) $(O)windmain.o: $(MSWSYS)/windmain.c $(HACK_H) $(O)windows.o: windows.c $(HACK_H) $(INCL)/wingem.h $(INCL)/winGnome.h $(O)wizard.o: wizard.c $(HACK_H) -$(O)worm.o: worm.c $(HACK_H) $(INCL)/lev.h +$(O)worm.o: worm.c $(HACK_H) $(O)worn.o: worn.c $(HACK_H) $(O)write.o: write.c $(HACK_H) $(O)zap.o: zap.c $(HACK_H) diff --git a/sys/winnt/Makefile.msc b/sys/winnt/Makefile.msc index e11078f64..3143e8c20 100644 --- a/sys/winnt/Makefile.msc +++ b/sys/winnt/Makefile.msc @@ -1999,16 +1999,16 @@ $(O)apply.o: apply.c $(HACK_H) $(O)artifact.o: artifact.c $(HACK_H) $(INCL)\artifact.h $(INCL)\artilist.h $(O)attrib.o: attrib.c $(HACK_H) $(O)ball.o: ball.c $(HACK_H) -$(O)bones.o: bones.c $(HACK_H) $(INCL)\lev.h +$(O)bones.o: bones.c $(HACK_H) $(O)botl.o: botl.c $(HACK_H) -$(O)cmd.o: cmd.c $(HACK_H) $(INCL)\lev.h $(INCL)\func_tab.h +$(O)cmd.o: cmd.c $(HACK_H) $(INCL)\func_tab.h $(O)dbridge.o: dbridge.c $(HACK_H) $(O)decl.o: decl.c $(HACK_H) $(O)detect.o: detect.c $(HACK_H) $(INCL)\artifact.h $(O)dig.o: dig.c $(HACK_H) $(O)display.o: display.c $(HACK_H) $(O)dlb.o: dlb.c $(CONFIG_H) $(INCL)\dlb.h $(INCL)\patchlevel.h -$(O)do.o: do.c $(HACK_H) $(INCL)\lev.h +$(O)do.o: do.c $(HACK_H) $(O)do_name.o: do_name.c $(HACK_H) $(O)do_wear.o: do_wear.c $(HACK_H) $(O)dog.o: dog.c $(HACK_H) @@ -2016,21 +2016,20 @@ $(O)dogmove.o: dogmove.c $(HACK_H) $(INCL)\mfndpos.h $(O)dokick.o: dokick.c $(HACK_H) $(O)dothrow.o: dothrow.c $(HACK_H) $(O)drawing.o: drawing.c $(HACK_H) $(INCL)\tcap.h -$(O)dungeon.o: dungeon.c $(HACK_H) $(INCL)\dgn_file.h $(INCL)\dlb.h \ - $(INCL)\lev.h +$(O)dungeon.o: dungeon.c $(HACK_H) $(INCL)\dgn_file.h $(INCL)\dlb.h $(O)eat.o: eat.c $(HACK_H) -$(O)end.o: end.c $(HACK_H) $(INCL)\lev.h $(INCL)\dlb.h -$(O)engrave.o: engrave.c $(HACK_H) $(INCL)\lev.h +$(O)end.o: end.c $(HACK_H) $(INCL)\dlb.h +$(O)engrave.o: engrave.c $(HACK_H) $(O)exper.o: exper.c $(HACK_H) $(O)explode.o: explode.c $(HACK_H) $(O)extralev.o: extralev.c $(HACK_H) -$(O)files.o: files.c $(HACK_H) $(INCL)\dlb.h $(INCL)\lev.h #zlib.h +$(O)files.o: files.c $(HACK_H) $(INCL)\dlb.h #zlib.h $(O)fountain.o: fountain.c $(HACK_H) $(O)hack.o: hack.c $(HACK_H) $(O)hacklib.o: hacklib.c $(HACK_H) $(O)invent.o: invent.c $(HACK_H) $(O)isaac64.o: isaac64.c $(CONFIG_H) $(INCL)\isaac64.h -$(O)light.o: light.c $(HACK_H) $(INCL)\lev.h +$(O)light.o: light.c $(HACK_H) $(O)lock.o: lock.c $(HACK_H) $(O)mail.o: mail.c $(HACK_H) $(INCL)\mail.h $(O)makemon.o: makemon.c $(HACK_H) @@ -2049,7 +2048,7 @@ $(O)mhitu.o: mhitu.c $(HACK_H) $(INCL)\artifact.h $(O)minion.o: minion.c $(HACK_H) $(O)mklev.o: mklev.c $(HACK_H) $(O)mkmap.o: mkmap.c $(HACK_H) $(INCL)\sp_lev.h -$(O)mkmaze.o: mkmaze.c $(HACK_H) $(INCL)\sp_lev.h $(INCL)\lev.h +$(O)mkmaze.o: mkmaze.c $(HACK_H) $(INCL)\sp_lev.h $(O)mkobj.o: mkobj.c $(HACK_H) $(O)mkroom.o: mkroom.c $(HACK_H) $(O)mon.o: mon.c $(HACK_H) $(INCL)\mfndpos.h @@ -2064,7 +2063,7 @@ $(O)muse.o: muse.c $(HACK_H) $(O)music.o: music.c $(HACK_H) $(O)nhlua.o: nhlua.c $(HACK_H) $(INCL)\dlb.h $(O)nhlsel.o: nhlsel.c $(HACK_H) $(INCL)\sp_lev.h -$(O)o_init.o: o_init.c $(HACK_H) $(INCL)\lev.h +$(O)o_init.o: o_init.c $(HACK_H) $(O)objects.o: objects.c $(CONFIG_H) $(INCL)\obj.h $(INCL)\objclass.h \ $(INCL)\prop.h $(INCL)\skills.h $(INCL)\color.h $(O)objnam.o: objnam.c $(HACK_H) @@ -2081,13 +2080,13 @@ $(O)quest.o: quest.c $(HACK_H) $(O)questpgr.o: questpgr.c $(HACK_H) $(INCL)\dlb.h $(O)read.o: read.c $(HACK_H) $(O)rect.o: rect.c $(HACK_H) -$(O)region.o: region.c $(HACK_H) $(INCL)\lev.h -$(O)restore.o: restore.c $(HACK_H) $(INCL)\lev.h $(INCL)\tcap.h +$(O)region.o: region.c $(HACK_H) +$(O)restore.o: restore.c $(HACK_H) $(INCL)\tcap.h $(O)rip.o: rip.c $(HACK_H) $(O)rnd.o: rnd.c $(HACK_H) $(INCL)\isaac64.h $(O)role.o: role.c $(HACK_H) -$(O)rumors.o: rumors.c $(HACK_H) $(INCL)\lev.h $(INCL)\dlb.h -$(O)save.o: save.c $(HACK_H) $(INCL)\lev.h +$(O)rumors.o: rumors.c $(HACK_H) $(INCL)\dlb.h +$(O)save.o: save.c $(HACK_H) $(O)sfstruct.o: sfstruct.c $(HACK_H) $(O)shk.o: shk.c $(HACK_H) $(O)shknam.o: shknam.c $(HACK_H) @@ -2099,7 +2098,7 @@ $(O)steal.o: steal.c $(HACK_H) $(O)steed.o: steed.c $(HACK_H) $(O)sys.o: sys.c $(HACK_H) $(O)teleport.o: teleport.c $(HACK_H) -$(O)timeout.o: timeout.c $(HACK_H) $(INCL)\lev.h +$(O)timeout.o: timeout.c $(HACK_H) $(O)topten.o: topten.c $(HACK_H) $(INCL)\dlb.h $(INCL)\patchlevel.h $(O)track.o: track.c $(HACK_H) $(O)trap.o: trap.c $(HACK_H) @@ -2107,14 +2106,14 @@ $(O)u_init.o: u_init.c $(HACK_H) $(O)uhitm.o: uhitm.c $(HACK_H) $(O)vault.o: vault.c $(HACK_H) $(O)version.o: version.c $(HACK_H) $(INCL)\dlb.h $(INCL)\date.h \ - $(INCL)\lev.h $(INCL)\patchlevel.h + $(INCL)\patchlevel.h $(O)vision.o: vision.c $(HACK_H) $(INCL)\vis_tab.h $(O)weapon.o: weapon.c $(HACK_H) $(O)were.o: were.c $(HACK_H) $(O)wield.o: wield.c $(HACK_H) $(O)windows.o: windows.c $(HACK_H) $(INCL)\wingem.h $(INCL)\winGnome.h $(O)wizard.o: wizard.c $(HACK_H) -$(O)worm.o: worm.c $(HACK_H) $(INCL)\lev.h +$(O)worm.o: worm.c $(HACK_H) $(O)worn.o: worn.c $(HACK_H) $(O)write.o: write.c $(HACK_H) $(O)zap.o: zap.c $(HACK_H) diff --git a/win/win32/vs2017/NetHack.vcxproj b/win/win32/vs2017/NetHack.vcxproj index a95e3d8d5..924900537 100644 --- a/win/win32/vs2017/NetHack.vcxproj +++ b/win/win32/vs2017/NetHack.vcxproj @@ -244,7 +244,6 @@ -