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

trunk only: preserving context (sys files)

Browse Source 
Pat Rankin wrote:
> collect them all into some new struct and
> save that separately rather than jamming more non-option stuff
> into struct flags.

This patch:
- collects all context/tracking related fields from flags
  into a new structure called "context."
It also adds the following to the new structure:
- stethoscope turn support
- victual support
- tin support
This commit is contained in:
nethack.allison
2003-09-21 11:56:11 +00:00
parent 22ce5ed6f2
commit 18e971e442
13 changed files with 31 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files
sys/amiga/Makefile.agc
+4 -4
View File
@@ -1267,10 +1267,10 @@ $(I)global.h: $(I)coord.h $(I)pcconf.h $(I)amiconf.h
-setdate $(I)global.h -setdate $(I)global.h
-c:wait 2 -c:wait 2
$(I)hack.h: $(I)config.h $(I)trap.h $(I)decl.h $(I)dungeon.h $(I)monsym.h \ $(I)hack.h: $(I)config.h $(I)context.h $(I)trap.h $(I)decl.h $(I)dungeon.h
$(I)mkroom.h $(I)objclass.h $(I)flag.h $(I)rm.h $(I)vision.h \ $(I)monsym.h $(I)mkroom.h $(I)objclass.h $(I)flag.h $(I)rm.h
$(I)display.h $(I)wintype.h $(I)engrave.h $(I)rect.h \ $(I)vision.h $(I)display.h $(I)wintype.h $(I)engrave.h
$(I)region.h $(I)trampoli.h $(I)rect.h $(I)region.h $(I)trampoli.h
-setdate $(I)hack.h -setdate $(I)hack.h
-c:wait 2 -c:wait 2
sys/amiga/Makefile.ami
+4 -4
View File
@@ -1607,10 +1607,10 @@ $(I)global.h: $(I)coord.h $(I)pcconf.h $(I)amiconf.h
-setdate $(I)global.h -setdate $(I)global.h
-wait 2 -wait 2
$(I)hack.h: $(I)config.h $(I)trap.h $(I)decl.h $(I)dungeon.h $(I)monsym.h \ $(I)hack.h: $(I)config.h $(I)context.h $(I)trap.h $(I)decl.h $(I)dungeon.h
$(I)mkroom.h $(I)objclass.h $(I)flag.h $(I)rm.h $(I)vision.h \ $(I)monsym.h $(I)mkroom.h $(I)objclass.h $(I)flag.h $(I)rm.h
$(I)display.h $(I)wintype.h $(I)engrave.h $(I)rect.h \ $(I)vision.h $(I)display.h $(I)wintype.h $(I)engrave.h
$(I)region.h $(I)trampoli.h $(I)rect.h $(I)region.h $(I)trampoli.h
-setdate $(I)hack.h -setdate $(I)hack.h
-wait 2 -wait 2
sys/msdos/Makefile.BC
+2 -2
View File
@@ -860,8 +860,8 @@ DECL_H = $(INCL)\quest.h $(INCL)\spell.h $(INCL)\color.h \
CONFIG_H = $(INCL)\config1.h $(INCL)\tradstdc.h $(INCL)\coord.h $(PCCONF_H) \ CONFIG_H = $(INCL)\config1.h $(INCL)\tradstdc.h $(INCL)\coord.h $(PCCONF_H) \
$(INCL)\config.h $(INCL)\config.h
HACK_H = $(CONFIG_H) $(INCL)\dungeon.h $(INCL)\align.h $(INCL)\monsym.h \ HACK_H = $(CONFIG_H) $(INCL)\context.h $(INCL)\dungeon.h $(INCL)\align.h \
$(INCL)\mkroom.h $(INCL)\objclass.h $(DECL_H) \ $(INCL)\monsym.h $(INCL)\mkroom.h $(INCL)\objclass.h $(DECL_H) \
$(INCL)\timeout.h $(INCL)\trap.h $(INCL)\flag.h $(INCL)\rm.h \ $(INCL)\timeout.h $(INCL)\trap.h $(INCL)\flag.h $(INCL)\rm.h \
$(INCL)\vision.h $(INCL)\mondata.h $(INCL)\wintype.h \ $(INCL)\vision.h $(INCL)\mondata.h $(INCL)\wintype.h \
$(INCL)\engrave.h $(INCL)\rect.h $(EXTERN_H) \ $(INCL)\engrave.h $(INCL)\rect.h $(EXTERN_H) \
sys/msdos/Makefile.GCC
+7 -7
View File
@@ -361,13 +361,13 @@ CONFIG_H = $(GLOBAL_H) $(INCL)/tradstdc.h $(INCL)/config1.h \
DECL_H = $(YOU_H) $(INCL)/spell.h $(INCL)/color.h \ DECL_H = $(YOU_H) $(INCL)/spell.h $(INCL)/color.h \
$(INCL)/obj.h $(INCL)/onames.h $(INCL)/pm.h \ $(INCL)/obj.h $(INCL)/onames.h $(INCL)/pm.h \
$(INCL)/decl.h $(INCL)/decl.h
GLOBAL_H = $(PCCONF_H) $(INCL)/coord.h $(INCL)/global.h GLOBAL_H = $(PCCONF_H) $(INCL)/coord.h $(INCL)/global.h
HACK_H = $(CONFIG_H) $(DUNGEON_H) $(DECL_H) \ HACK_H = $(CONFIG_H) $(INCL)/context.h $(DUNGEON_H) \
$(DISPLAY_H) $(INCL)/monsym.h $(INCL)/mkroom.h \ $(DECL_H) $(DISPLAY_H) $(INCL)/monsym.h \
$(INCL)/objclass.h $(INCL)/trap.h $(INCL)/flag.h \ $(INCL)/mkroom.h $(INCL)/objclass.h $(INCL)/trap.h \
$(RM_H) $(INCL)/vision.h $(INCL)/wintype.h \ $(INCL)/flag.h $(RM_H) $(INCL)/vision.h \
$(INCL)/engrave.h $(INCL)/rect.h \ $(INCL)/wintype.h $(INCL)/engrave.h $(INCL)/rect.h \
$(INCL)/trampoli.h $(INCL)/hack.h $(REGION_H) $(INCL)/trampoli.h $(INCL)/hack.h $(REGION_H)
DLB_H = $(INCL)/dlb.h DLB_H = $(INCL)/dlb.h
ifeq ($(SUPPRESS_GRAPHICS),Y) ifeq ($(SUPPRESS_GRAPHICS),Y)
sys/msdos/Makefile.MSC
+1 -1
View File
@@ -264,7 +264,7 @@ DECL_H = $(YOU_H) $(INCL)\spell.h $(INCL)\color.h \
$(INCL)\obj.h $(INCL)\onames.h $(INCL)\pm.h \ $(INCL)\obj.h $(INCL)\onames.h $(INCL)\pm.h \
$(INCL)\decl.h $(INCL)\decl.h
GLOBAL_H = $(PCCONF_H) $(INCL)\coord.h $(INCL)\global.h GLOBAL_H = $(PCCONF_H) $(INCL)\coord.h $(INCL)\global.h
HACK_H = $(CONFIG_H) $(DUNGEON_H) $(DECL_H) \ HACK_H = $(CONFIG_H) $(INCL)\context.h $(DUNGEON_H) $(DECL_H) \
$(DISPLAY_H) $(INCL)\monsym.h $(INCL)\mkroom.h \ $(DISPLAY_H) $(INCL)\monsym.h $(INCL)\mkroom.h \
$(INCL)\objclass.h $(INCL)\trap.h $(INCL)\flag.h \ $(INCL)\objclass.h $(INCL)\trap.h $(INCL)\flag.h \
$(RM_H) $(INCL)\vision.h $(INCL)\wintype.h \ $(RM_H) $(INCL)\vision.h $(INCL)\wintype.h \
sys/os2/Makefile.os2
+1 -1
View File
@@ -714,7 +714,7 @@ YOU_H = $(INCL)\you.h $(INCL)\attrib.h $(PERMONST_H) $(INCL)\mondata.h \
$(INCL)\monst.h $(INCL)\youprop.h $(INCL)\prop.h $(INCL)\pm.h $(INCL)\monst.h $(INCL)\youprop.h $(INCL)\prop.h $(INCL)\pm.h
DECL_H = $(INCL)\decl.h $(INCL)\spell.h $(INCL)\obj.h $(YOU_H) \ DECL_H = $(INCL)\decl.h $(INCL)\spell.h $(INCL)\obj.h $(YOU_H) \
$(INCL)\onames.h $(INCL)\color.h $(INCL)\onames.h $(INCL)\color.h
HACK_H = $(CONFIG_H) $(DECL_H) $(INCL)\monsym.h $(INCL)\mkroom.h \ HACK_H = $(CONFIG_H) $(INCL)\context.h $(DECL_H) $(INCL)\monsym.h $(INCL)\mkroom.h \
$(INCL)\objclass.h $(TRAP_H) $(INCL)\engrave.h $(INCL)\flag.h \ $(INCL)\objclass.h $(TRAP_H) $(INCL)\engrave.h $(INCL)\flag.h \
$(INCL)\rm.h $(INCL)\dungeon.h $(INCL)\hack.h $(INCL)\display.h \ $(INCL)\rm.h $(INCL)\dungeon.h $(INCL)\hack.h $(INCL)\display.h \
$(INCL)\vision.h $(INCL)\wintty.h $(INCL)\wintype.h $(INCL)\align.h \ $(INCL)\vision.h $(INCL)\wintty.h $(INCL)\wintype.h $(INCL)\align.h \
sys/share/pcmain.c
+2 -2
View File
@@ -423,7 +423,7 @@ char *argv[];
} }
} }
flags.move = 0; context.move = 0;
} else { } else {
not_recovered: not_recovered:
player_selection(); player_selection();
@@ -431,7 +431,7 @@ not_recovered:
if (discover) if (discover)
You("are in non-scoring discovery mode."); You("are in non-scoring discovery mode.");
flags.move = 0; context.move = 0;
set_wear(); set_wear();
(void) pickup(1); (void) pickup(1);
read_engr_at(u.ux,u.uy); read_engr_at(u.ux,u.uy);
sys/unix/Makefile.src
+3 -3
View File
@@ -354,9 +354,9 @@ CSOURCES = $(HACKCSRC) $(SYSSRC) $(WINCSRC) $(GENCSRC)
# and dgn_comp.h, dgn_file.h, lev_comp.h, special level & dungeon files. # and dgn_comp.h, dgn_file.h, lev_comp.h, special level & dungeon files.
# #
HACKINCL = align.h amiconf.h artifact.h artilist.h attrib.h beconf.h color.h \ HACKINCL = align.h amiconf.h artifact.h artilist.h attrib.h beconf.h color.h \
config.h config1.h coord.h decl.h def_os2.h display.h dlb.h dungeon.h \ config.h config1.h context.h coord.h decl.h def_os2.h display.h dlb.h \
edog.h emin.h engrave.h epri.h eshk.h extern.h flag.h func_tab.h \ dungeon.h edog.h emin.h engrave.h epri.h eshk.h extern.h flag.h \
global.h hack.h lev.h macconf.h mfndpos.h micro.h mkroom.h \ func_tab.h global.h hack.h lev.h macconf.h mfndpos.h micro.h mkroom.h \
monattk.h mondata.h monflag.h monst.h monsym.h obj.h objclass.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 \ os2conf.h patchlevel.h pcconf.h permonst.h prop.h rect.h region.h rm.h \
sp_lev.h spell.h system.h tcap.h timeout.h tosconf.h tradstdc.h \ sp_lev.h spell.h system.h tcap.h timeout.h tosconf.h tradstdc.h \
sys/vms/Makefile.src
+3 -3
View File
@@ -126,9 +126,9 @@ VERSOURCES = $(HACKCSRC) $(SYSSRC) $(WINSRC) $(RANDSRC) $(GENCSRC)
# and dgn_comp.h, dgn_file.h, lev_comp.h, special level & dungeon files. # and dgn_comp.h, dgn_file.h, lev_comp.h, special level & dungeon files.
# #
HACKINCL = align.h amiconf.h artifact.h artilist.h attrib.h beconf.h color.h \ HACKINCL = align.h amiconf.h artifact.h artilist.h attrib.h beconf.h color.h \
config.h config1.h coord.h decl.h def_os2.h display.h dlb.h \ config.h config1.h context.h coord.h decl.h def_os2.h display.h \
dungeon.h edog.h emin.h engrave.h epri.h eshk.h extern.h flag.h \ dlb.h dungeon.h edog.h emin.h engrave.h epri.h eshk.h extern.h \
func_tab.h global.h hack.h lev.h macconf.h mfndpos.h micro.h \ flag.h func_tab.h global.h hack.h lev.h macconf.h mfndpos.h micro.h \
mkroom.h monattk.h mondata.h monflag.h monst.h monsym.h obj.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 \ objclass.h os2conf.h patchlevel.h pcconf.h permonst.h prop.h rect.h \
region.h rm.h sp_lev.h spell.h system.h tcap.h timeout.h tosconf.h \ region.h rm.h sp_lev.h spell.h system.h tcap.h timeout.h tosconf.h \
sys/vms/Makefile.utl
+1 -1
View File
@@ -159,7 +159,7 @@ $(MAKEDEFS) : $(MAKEOBJS) $(VMSMAKEOBJS) $(LIBOPT)
@ $(TOUCH) $(MARKER) @ $(TOUCH) $(MARKER)
makedefs.obj : makedefs.c \ makedefs.obj : makedefs.c \
$(CONFIG_H) $(INC)permonst.h $(INC)objclass.h \ $(CONFIG_H) $(IN)context.h $(INC)permonst.h $(INC)objclass.h \
$(INC)monsym.h $(INC)artilist.h $(INC)dungeon.h \ $(INC)monsym.h $(INC)artilist.h $(INC)dungeon.h \
$(INC)obj.h $(INC)monst.h $(INC)you.h $(INC)flag.h \ $(INC)obj.h $(INC)monst.h $(INC)you.h $(INC)flag.h \
$(INC)dlb.h $(INC)patchlevel.h $(INC)qtext.h $(INC)dlb.h $(INC)patchlevel.h $(INC)qtext.h
sys/winnt/Makefile.bcc
+1 -1
View File
@@ -472,7 +472,7 @@ CONFIG_H = $(INCL)\config.h $(INCL)\config1.h $(INCL)\tradstdc.h \
$(INCL)\amiconf.h $(INCL)\macconf.h $(INCL)\beconf.h \ $(INCL)\amiconf.h $(INCL)\macconf.h $(INCL)\beconf.h \
$(INCL)\ntconf.h $(INCL)\nhlan.h $(INCL)\ntconf.h $(INCL)\nhlan.h
HACK_H = $(INCL)\hack.h $(CONFIG_H) $(INCL)\align.h \ HACK_H = $(INCL)\hack.h $(CONFIG_H) $(INCL)\context.h $(INCL)\align.h \
$(INCL)\dungeon.h $(INCL)\monsym.h $(INCL)\mkroom.h \ $(INCL)\dungeon.h $(INCL)\monsym.h $(INCL)\mkroom.h \
$(INCL)\objclass.h $(INCL)\youprop.h $(INCL)\prop.h \ $(INCL)\objclass.h $(INCL)\youprop.h $(INCL)\prop.h \
$(INCL)\permonst.h $(INCL)\monattk.h \ $(INCL)\permonst.h $(INCL)\monattk.h \
sys/winnt/Makefile.gcc
+1 -1
View File
@@ -428,7 +428,7 @@ CONFIG_H = $(INCL)/config.h $(INCL)/config1.h $(INCL)/tradstdc.h \
$(INCL)/amiconf.h $(INCL)/macconf.h $(INCL)/beconf.h \ $(INCL)/amiconf.h $(INCL)/macconf.h $(INCL)/beconf.h \
$(INCL)/ntconf.h $(INCL)/nhlan.h $(INCL)/ntconf.h $(INCL)/nhlan.h
HACK_H = $(INCL)/hack.h $(CONFIG_H) $(INCL)/align.h \ HACK_H = $(INCL)/hack.h $(CONFIG_H) $(INCL)/align.h $(INCL)/context.h \
$(INCL)/dungeon.h $(INCL)/monsym.h $(INCL)/mkroom.h \ $(INCL)/dungeon.h $(INCL)/monsym.h $(INCL)/mkroom.h \
$(INCL)/objclass.h $(INCL)/youprop.h $(INCL)/prop.h \ $(INCL)/objclass.h $(INCL)/youprop.h $(INCL)/prop.h \
$(INCL)/permonst.h $(INCL)/monattk.h \ $(INCL)/permonst.h $(INCL)/monattk.h \
sys/winnt/Makefile.msc
+1 -1
View File
@@ -407,7 +407,7 @@ CONFIG_H = $(INCL)\config.h $(INCL)\config1.h $(INCL)\tradstdc.h \
$(INCL)\amiconf.h $(INCL)\macconf.h $(INCL)\beconf.h \ $(INCL)\amiconf.h $(INCL)\macconf.h $(INCL)\beconf.h \
$(INCL)\ntconf.h $(INCL)\nhlan.h $(INCL)\ntconf.h $(INCL)\nhlan.h
HACK_H = $(INCL)\hack.h $(CONFIG_H) $(INCL)\align.h \ HACK_H = $(INCL)\hack.h $(CONFIG_H) $(INCL)\align.h $(INCL)\context.h \
$(INCL)\dungeon.h $(INCL)\monsym.h $(INCL)\mkroom.h \ $(INCL)\dungeon.h $(INCL)\monsym.h $(INCL)\mkroom.h \
$(INCL)\objclass.h $(INCL)\youprop.h $(INCL)\prop.h \ $(INCL)\objclass.h $(INCL)\youprop.h $(INCL)\prop.h \
$(INCL)\permonst.h $(INCL)\monattk.h \ $(INCL)\permonst.h $(INCL)\monattk.h \