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

Add monster spell header file mcastu.h

Browse Source 
Move the monster spell definitions there, and use hackery
(similar to objects.h) to generate enum and data from
the header file.

I have not tested Windows, VMS, or Amiga builds.
This commit is contained in:
Pasi Kallinen
2026-03-24 17:23:43 +02:00
parent d929adc85c
commit d78af5cec7
8 changed files with 72 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
sys/msdos/Makefile.GCC
View File

@@ -416,6 +416,7 @@ 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)/objclass.h \
$(INCL)/mcastu.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) \
@@ -1407,7 +1408,7 @@ $(TARGETPFX)light.o: light.c $(HACK_H)
$(TARGETPFX)lock.o: lock.c $(HACK_H)
$(TARGETPFX)mail.o: mail.c $(HACK_H) ../include/mail.h
$(TARGETPFX)makemon.o: makemon.c $(HACK_H)
$(TARGETPFX)mcastu.o: mcastu.c $(HACK_H)
$(TARGETPFX)mcastu.o: mcastu.c $(HACK_H) ../include/mcastu.h
$(TARGETPFX)mdlib.o: mdlib.c $(CONFIG_H) ../include/permonst.h \
../include/align.h ../include/monattk.h ../include/monflag.h \
../include/monsters.h ../include/objclass.h \

4
sys/unix/Makefile.src
View File

@@ -571,6 +571,7 @@ HACKINCL = align.h artifact.h artilist.h attrib.h botl.h \
color.h config.h config1.h context.h coord.h cstd.h decl.h \
defsym.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 \
mcastu.h \
micro.h mfndpos.h mkroom.h monattk.h mondata.h monflag.h monst.h \
monsters.h nhmd4.h obj.h objects.h objclass.h optlist.h patchlevel.h \
pcconf.h permonst.h prop.h rect.h region.h savefile.h selvar.h sym.h \
@@ -896,6 +897,7 @@ $(HACK_H): $(CONFIG_H) ../include/align.h ../include/artilist.h \
../include/decl.h ../include/defsym.h ../include/display.h \
../include/dungeon.h ../include/engrave.h ../include/flag.h \
../include/hack.h ../include/lint.h ../include/mextra.h \
../include/mcastu.h \
../include/mkroom.h ../include/monattk.h ../include/mondata.h \
../include/monflag.h ../include/monst.h ../include/monsters.h \
../include/nhlua.h ../include/obj.h ../include/objclass.h \
@@ -1185,7 +1187,7 @@ $(TARGETPFX)light.o: light.c $(HACK_H)
$(TARGETPFX)lock.o: lock.c $(HACK_H)
$(TARGETPFX)mail.o: mail.c $(HACK_H) ../include/mail.h
$(TARGETPFX)makemon.o: makemon.c $(HACK_H)
$(TARGETPFX)mcastu.o: mcastu.c $(HACK_H)
$(TARGETPFX)mcastu.o: mcastu.c $(HACK_H) ../include/mcastu.h
$(TARGETPFX)mdlib.o: mdlib.c $(CONFIG_H) ../include/align.h \
../include/artilist.h ../include/attrib.h \
../include/context.h ../include/defsym.h ../include/dlb.h \

1
sys/windows/GNUmakefile
View File

@@ -794,6 +794,7 @@ HACK_H = $(CONFIG_H) ../include/align.h ../include/artilist.h \
../include/decl.h ../include/defsym.h ../include/display.h \
../include/dungeon.h ../include/engrave.h ../include/flag.h \
../include/hack.h ../include/lint.h ../include/mextra.h \
../include/mcastu.h \
../include/mkroom.h ../include/monattk.h ../include/mondata.h \
../include/monflag.h ../include/monst.h ../include/monsters.h \
../include/nhlua.h ../include/obj.h ../include/objclass.h \

7
sys/windows/Makefile.nmake
View File

@@ -694,6 +694,7 @@ HACKINCL = \
$(INCL)flag.h $(INCL)fnamesiz.h $(INCL)func_tab.h \
$(INCL)global.h $(INCL)warnings.h $(INCL)hack.h \
$(INCL)lint.h $(INCL)mextra.h $(INCL)micro.h \
$(INCL)mcastu.h \
$(INCL)mfndpos.h $(INCL)mkroom.h $(INCL)monattk.h \
$(INCL)mondata.h $(INCL)monflag.h $(INCL)monst.h \
$(INCL)monsters.h $(INCL)nhmd4.h $(INCL)obj.h \
@@ -1131,6 +1132,7 @@ HACK_H = $(CONFIG_H) $(INCL)align.h $(INCL)artilist.h \
$(INCL)decl.h $(INCL)defsym.h $(INCL)display.h \
$(INCL)dungeon.h $(INCL)engrave.h $(INCL)flag.h \
$(INCL)hack.h $(INCL)lint.h $(INCL)mextra.h \
$(INCL)mcastu.h \
$(INCL)mkroom.h $(INCL)monattk.h $(INCL)mondata.h \
$(INCL)monflag.h $(INCL)monst.h $(INCL)monsters.h \
$(INCL)nhlua.h $(INCL)obj.h $(INCL)objclass.h \
@@ -2664,7 +2666,7 @@ CTAGDEP = $(INCL)align.h $(INCL)artifact.h $(INCL)artilist.h \
$(INCL)attrib.h $(INCL)context.h $(INCL)coord.h \
$(INCL)decl.h $(INCL)dungeon.h $(INCL)engrave.h \
$(INCL)flag.h $(INCL)func_tab.h $(INCL)global.h \
$(INCL)hack.h $(INCL)mextra.h \
$(INCL)hack.h $(INCL)mextra.h $(INCL)mcastu.h \
$(INCL)mkroom.h $(INCL)monst.h \
$(INCL)obj.h $(INCL)objclass.h $(INCL)prop.h \
$(INCL)quest.h $(INCL)rect.h $(INCL)region.h \
@@ -2694,6 +2696,7 @@ $(UTIL)sf.tags: $(CTAGSCMD) $(CTAGDEP)
$(CTAGSCMD) $(CTAGSOPT) -a -f $@ $(INCL)global.h
$(CTAGSCMD) $(CTAGSOPT) -a -f $@ $(INCL)hack.h
$(CTAGSCMD) $(CTAGSOPT) -a -f $@ $(INCL)mextra.h
$(CTAGSCMD) $(CTAGSOPT) -a -f $@ $(INCL)mcastu.h
$(CTAGSCMD) $(CTAGSOPT) -a -f $@ $(INCL)mkroom.h
$(CTAGSCMD) $(CTAGSOPT) -a -f $@ $(INCL)monst.h
$(CTAGSCMD) $(CTAGSOPT) -a -f $@ $(INCL)defsym.h
@@ -3269,7 +3272,7 @@ $(OTTY)light.o: light.c $(HACK_H)
$(OTTY)lock.o: lock.c $(HACK_H)
$(OTTY)mail.o: mail.c $(HACK_H) $(INCL)mail.h
$(OTTY)makemon.o: makemon.c $(HACK_H)
$(OTTY)mcastu.o: mcastu.c $(HACK_H)
$(OTTY)mcastu.o: mcastu.c $(HACK_H) $(INCL)mcastu.h
$(OTTY)mdlib.o: mdlib.c $(CONFIG_H) $(INCL)align.h \
$(INCL)artilist.h $(INCL)attrib.h \
$(INCL)context.h $(INCL)defsym.h $(INCL)dlb.h \

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

@@ -259,6 +259,7 @@
<ClInclude Include="$(IncDir)isaac64.h" />
<ClInclude Include="$(IncDir)lint.h" />
<ClInclude Include="$(IncDir)load_img.h" />
<ClInclude Include="$(IncDir)mcastu.h" />
<ClInclude Include="$(IncDir)mextra.h" />
<ClInclude Include="$(IncDir)mfndpos.h" />
<ClInclude Include="$(IncDir)mkroom.h" />

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

@@ -327,6 +327,7 @@
<ClInclude Include="$(IncDir)lint.h" />
<ClInclude Include="$(IncDir)load_img.h" />
<ClInclude Include="$(IncDir)mail.h" />
<ClInclude Include="$(IncDir)mcastu.h" />
<ClInclude Include="$(IncDir)mextra.h" />
<ClInclude Include="$(IncDir)mfndpos.h" />
<ClInclude Include="$(IncDir)micro.h" />