move 'g.restoring' to 'g.program_state.restoring'
Move the core's global restoring flag (not the same as main()'s local resuming flag) to a more logical place. Add a saving flag in the process, but it isn't being set or cleared anywhere yet. (Once in use it will probably fix the exception during save that was just reported, but before that it would be useful to figure out what specifically caused the event.) The program_state struct really ought to be standalone rather than part of struct g but I haven't made that change. Removing an unused variable for wishing and some reformatting that whent along with it got mixed in. Removes some trailing whitespace in sfstruct.c too. Only lightly tested...
This commit is contained in:
@@ -1,4 +1,4 @@
|
||||
NHDT-Branch: NetHack-3.7 $:$NHDT-Revision: 1.367 $ $NHDT-Date: 1606697932 2020/11/30 00:58:52 $
|
||||
NHDT-Branch: NetHack-3.7 $:$NHDT-Revision: 1.368 $ $NHDT-Date: 1606765210 2020/11/30 19:40:10 $
|
||||
|
||||
General Fixes and Modified Features
|
||||
-----------------------------------
|
||||
@@ -736,3 +736,8 @@ add an additional note to mextra.h and obj.h comments that reminds people to
|
||||
appropriately init new fields if they need to initialize to something
|
||||
other than zero
|
||||
rework stairs structure into a linked list
|
||||
move 'restoring' to the program_state struct; add corresponding 'saving';
|
||||
both used to enforce no updating of status lines or of persistent
|
||||
inventory when the relevant activity is in progress
|
||||
|
||||
|
||||
|
||||
Reference in New Issue
Block a user