ren nhconst.h -> weight.h

The speed related values were not used, except for NORMAL_SPEED,
which has been moved back to permonst.h
This commit is contained in:
nhmall
2025-03-19 17:14:07 -04:00
parent 601d03b71d
commit 1f99638bbf
13 changed files with 40 additions and 42 deletions

View File

@@ -415,11 +415,11 @@ DECL_H = $(YOU_H) $(INCL)/spell.h $(INCL)/color.h \
GLOBAL_H = $(PCCONF_H) $(INCL)/coord.h $(INCL)/global.h
HACK_H = $(CONFIG_H) $(INCL)/context.h $(DUNGEON_H) \
$(DECL_H) $(DISPLAY_H) $(INCL)/sym.h \
$(INCL)/defsym.h $(INCL)/mkroom.h $(INCL)/nhconst.h \
$(INCL)/objclass.h $(INCL)/trap.h $(INCL)/flag.h \
$(RM_H) $(INCL)/vision.h $(INCL)/wintype.h \
$(INCL)/engrave.h $(INCL)/rect.h $(INCL)/hack.h \
$(REGION_H) $(INCL)/sys.h
$(INCL)/defsym.h $(INCL)/mkroom.h $(INCL)/objclass.h \
$(INCL)/trap.h $(INCL)/flag.h $(RM_H) \
$(INCL)/vision.h $(INCL)/wintype.h $(INCL)/engrave.h \
$(INCL)/rect.h $(INCL)/hack.h $(REGION_H) \
$(INCL)/sys.h $(INCL)/weight.h
DLB_H = $(INCL)/dlb.h
ifeq ($(SUPPRESS_GRAPHICS),Y)

View File

@@ -560,15 +560,15 @@ CSOURCES = $(HACKCSRC) $(HACKLIBSRC) $(SYSCSRC) $(WINCSRC) $(CHAINSRC) $(GENCSRC
# and dgn_file.h, special level & dungeon files.
#
HACKINCL = align.h artifact.h artilist.h attrib.h botl.h \
color.h config.h config1.h context.h coord.h decl.h \
color.h config.h config1.h context.h coord.h cstd.h decl.h \
display.h dlb.h dungeon.h engrave.h extern.h flag.h fnamesiz.h \
func_tab.h global.h warnings.h hack.h lint.h mextra.h mfndpos.h \
micro.h mkroom.h monattk.h mondata.h monflag.h monst.h monsters.h \
nhconst.h nhmd4.h obj.h objects.h objclass.h optlist.h patchlevel.h \
nhmd4.h obj.h objects.h objclass.h optlist.h patchlevel.h \
pcconf.h permonst.h prop.h rect.h region.h selvar.h sym.h defsym.h \
rm.h sp_lev.h spell.h sndprocs.h seffects.h stairs.h sys.h tcap.h \
timeout.h tradstdc.h trap.h unixconf.h vision.h vmsconf.h wintty.h \
wincurs.h winX.h winprocs.h wintype.h you.h youprop.h cstd.h
wincurs.h winX.h winprocs.h wintype.h you.h youprop.h weight.h
HSOURCES = $(HACKINCL) dgn_file.h
@@ -883,15 +883,15 @@ $(HACK_H): $(CONFIG_H) ../include/align.h ../include/artilist.h \
../include/hack.h ../include/lint.h ../include/mextra.h \
../include/mkroom.h ../include/monattk.h ../include/mondata.h \
../include/monflag.h ../include/monst.h ../include/monsters.h \
../include/nhconst.h ../include/nhlua.h ../include/obj.h \
../include/objclass.h ../include/objects.h ../include/permonst.h \
../include/prop.h ../include/quest.h ../include/rect.h \
../include/region.h ../include/rm.h ../include/seffects.h \
../include/selvar.h ../include/skills.h ../include/sndprocs.h \
../include/spell.h ../include/stairs.h ../include/sym.h \
../include/sys.h ../include/timeout.h ../include/trap.h \
../include/vision.h ../include/winprocs.h ../include/wintype.h \
../include/you.h ../include/youprop.h
../include/nhlua.h ../include/obj.h ../include/objclass.h \
../include/objects.h ../include/permonst.h ../include/prop.h \
../include/quest.h ../include/rect.h ../include/region.h \
../include/rm.h ../include/seffects.h ../include/selvar.h \
../include/skills.h ../include/sndprocs.h ../include/spell.h \
../include/stairs.h ../include/sym.h ../include/sys.h \
../include/timeout.h ../include/trap.h ../include/vision.h \
../include/weight.h ../include/winprocs.h \
../include/wintype.h ../include/you.h ../include/youprop.h
touch $(HACK_H)
#
$(TARGETPFX)cppregex.o: ../sys/share/cppregex.cpp $(CONFIG_H)
@@ -1177,7 +1177,7 @@ $(TARGETPFX)mdlib.o: mdlib.c $(CONFIG_H) ../include/align.h \
../include/objclass.h ../include/objects.h \
../include/permonst.h ../include/prop.h ../include/seffects.h \
../include/skills.h ../include/sndprocs.h ../include/sym.h \
../include/wintype.h ../include/you.h
../include/weight.h ../include/wintype.h ../include/you.h
$(TARGETPFX)mhitm.o: mhitm.c $(HACK_H) ../include/artifact.h
$(TARGETPFX)mhitu.o: mhitu.c $(HACK_H) ../include/artifact.h
$(TARGETPFX)minion.o: minion.c $(HACK_H)
@@ -1193,7 +1193,7 @@ $(TARGETPFX)monmove.o: monmove.c $(HACK_H) ../include/artifact.h \
$(TARGETPFX)monst.o: monst.c $(CONFIG_H) ../include/align.h \
../include/defsym.h ../include/monattk.h ../include/monflag.h \
../include/monsters.h ../include/permonst.h ../include/sym.h \
../include/wintype.h
../include/weight.h ../include/wintype.h
$(TARGETPFX)mplayer.o: mplayer.c $(HACK_H)
$(TARGETPFX)mthrowu.o: mthrowu.c $(HACK_H)
$(TARGETPFX)muse.o: muse.c $(HACK_H)

View File

@@ -393,7 +393,7 @@ $(HACK_H) : $(INC)hack.h $(CONFIG_H) $(INC)align.h \
$(INC)dungeon.h $(INC)sym.h $(INC)defsym.h $(INC)mkroom.h \
$(INC)objclass.h $(INC)youprop.h $(INC)prop.h \
$(INC)permonst.h $(INC)monattk.h \
$(INC)monflag.h $(INC)mondata.h $(INC)nhconst.h $(INC)pm.h \
$(INC)monflag.h $(INC)mondata.h $(INC)pm.h \
$(INC)wintype.h $(INC)context.h $(INC)decl.h $(INC)quest.h \
$(INC)spell.h $(INC)color.h $(INC)obj.h \
$(INC)you.h $(INC)attrib.h $(INC)monst.h \
@@ -401,7 +401,7 @@ $(HACK_H) : $(INC)hack.h $(CONFIG_H) $(INC)align.h \
$(INC)monsters.h $(INC)timeout.h $(INC)trap.h \
$(INC)flag.h $(INC)rm.h $(INC)vision.h \
$(INC)display.h $(INC)engrave.h $(INC)rect.h $(INC)region.h \
$(INC)winprocs.h $(INC)wintty.h $(INC)sys.h
$(INC)weight.h $(INC)winprocs.h $(INC)wintty.h $(INC)sys.h
$(TOUCH) $(HACK_H)
# VMS-specific code
vmsmain.obj : $(VMS)vmsmain.c $(HACK_H) $(INC)dlb.h

View File

@@ -750,7 +750,8 @@ $(TARGETPFX)mdlib.obj: mdlib.c $(CONFIG_H) $(INCL)permonst.h \
$(INCL)sndprocs.h $(INCL)seffects.h $(INCL)obj.h \
$(INCL)monst.h $(INCL)mextra.h $(INCL)you.h \
$(INCL)attrib.h $(INCL)prop.h $(INCL)skills.h \
$(INCL)context.h $(INCL)flag.h $(INCL)dlb.h
$(INCL)context.h $(INCL)flag.h $(INCL)dlb.h \
$(INCL)weight.h
$(TARGETPFX)mhitm.obj: mhitm.c $(HACK_H) $(INCL)artifact.h
$(TARGETPFX)mhitu.obj: mhitu.c $(HACK_H) $(INCL)artifact.h
$(TARGETPFX)minion.obj: minion.c $(HACK_H)
@@ -766,7 +767,7 @@ $(TARGETPFX)monmove.obj: monmove.c $(HACK_H) $(INCL)mfndpos.h \
$(TARGETPFX)monst.obj: monst.c $(CONFIG_H) $(INCL)permonst.h \
$(INCL)align.h $(INCL)monattk.h $(INCL)monflag.h \
$(INCL)monsters.h $(INCL)wintype.h $(INCL)sym.h \
$(INCL)defsym.h $(INCL)color.h
$(INCL)defsym.h $(INCL)color.h $(INCL)weight.h
$(TARGETPFX)mplayer.obj: mplayer.c $(HACK_H)
$(TARGETPFX)mthrowu.obj: mthrowu.c $(HACK_H)
$(TARGETPFX)muse.obj: muse.c $(HACK_H)

View File

@@ -1121,14 +1121,14 @@ HACK_H = $(CONFIG_H) $(INCL)align.h $(INCL)artilist.h \
$(INCL)hack.h $(INCL)lint.h $(INCL)mextra.h \
$(INCL)mkroom.h $(INCL)monattk.h $(INCL)mondata.h \
$(INCL)monflag.h $(INCL)monst.h $(INCL)monsters.h \
$(INCL)nhconst.h $(INCL)nhlua.h $(INCL)obj.h \
$(INCL)objclass.h $(INCL)objects.h $(INCL)permonst.h \
$(INCL)prop.h $(INCL)quest.h $(INCL)rect.h \
$(INCL)region.h $(INCL)rm.h $(INCL)seffects.h \
$(INCL)selvar.h $(INCL)skills.h $(INCL)sndprocs.h \
$(INCL)spell.h $(INCL)stairs.h $(INCL)sym.h \
$(INCL)sys.h $(INCL)timeout.h $(INCL)trap.h \
$(INCL)vision.h $(INCL)winprocs.h $(INCL)wintype.h \
$(INCL)nhlua.h $(INCL)obj.h $(INCL)objclass.h \
$(INCL)objects.h $(INCL)permonst.h $(INCL)prop.h \
$(INCL)quest.h $(INCL)rect.h $(INCL)region.h \
$(INCL)rm.h $(INCL)seffects.h $(INCL)selvar.h \
$(INCL)skills.h $(INCL)sndprocs.h $(INCL)spell.h \
$(INCL)stairs.h $(INCL)sym.h $(INCL)sys.h \
$(INCL)timeout.h $(INCL)trap.h $(INCL)vision.h \
$(INCL)\weight.h $(INCL)winprocs.h $(INCL)wintype.h \
$(INCL)you.h $(INCL)youprop.h
TILE_H = $(WSHR)tile.h

View File

@@ -279,6 +279,7 @@
<ClInclude Include="$(IncDir)tradstdc.h" />
<ClInclude Include="$(IncDir)trap.h" />
<ClInclude Include="$(IncDir)vision.h" />
<ClInclude Include="$(IncDir)weight.h" />
<ClInclude Include="$(IncDir)winprocs.h" />
<ClInclude Include="$(IncDir)wintty.h" />
<ClInclude Include="$(IncDir)wintype.h" />

View File

@@ -341,6 +341,7 @@
<ClInclude Include="$(IncDir)unixconf.h" />
<ClInclude Include="$(IncDir)vision.h" />
<ClInclude Include="$(IncDir)vmsconf.h" />
<ClInclude Include="$(IncDir)weight.h" />
<ClInclude Include="$(IncDir)winami.h" />
<ClInclude Include="$(IncDir)wincurs.h" />
<ClInclude Include="$(IncDir)winprocs.h" />

View File

@@ -79,6 +79,7 @@
<ClInclude Include="$(IncDir)tradstdc.h" />
<ClInclude Include="$(IncDir)trap.h" />
<ClInclude Include="$(IncDir)vision.h" />
<ClInclude Include="$(IncDir)weight.h" />
<ClInclude Include="$(IncDir)winprocs.h" />
<ClInclude Include="$(IncDir)wintty.h" />
<ClInclude Include="$(IncDir)wintype.h" />