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

program_state moved to g.

Browse Source
This commit is contained in:
Bart House
2018-12-25 10:09:04 -08:00
parent ab73df996f
commit b1ab64db43
45 changed files with 130 additions and 132 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/cmd.c
View File

@@ -4475,7 +4475,7 @@ register char *cmd;
iflags.menu_requested = FALSE;
#ifdef SAFERHANGUP
if (program_state.done_hup)
if (g.program_state.done_hup)
end_of_input();
#endif
if (firsttime) {
@@ -5612,8 +5612,8 @@ void
hangup(sig_unused) /* called as signal() handler, so sent at least one arg */
int sig_unused UNUSED;
{
if (program_state.exiting)
program_state.in_moveloop = 0;
if (g.program_state.exiting)
g.program_state.in_moveloop = 0;
nhwindows_hangup();
#ifdef SAFERHANGUP
/* When using SAFERHANGUP, the done_hup flag it tested in rhack
@@ -5622,9 +5622,9 @@ int sig_unused UNUSED;
protects against losing objects in the process of being thrown,
but also potentially riskier because the disconnected program
must continue running longer before attempting a hangup save. */
program_state.done_hup++;
g.program_state.done_hup++;
/* defer hangup iff game appears to be in progress */
if (program_state.in_moveloop && program_state.something_worth_saving)
if (g.program_state.in_moveloop && g.program_state.something_worth_saving)
return;
#endif /* SAFERHANGUP */
end_of_input();
@@ -5635,16 +5635,16 @@ end_of_input()
{
#ifdef NOSAVEONHANGUP
#ifdef INSURANCE
if (flags.ins_chkpt && program_state.something_worth_saving)
if (flags.ins_chkpt && g.program_state.something_worth_saving)
program_statue.preserve_locks = 1; /* keep files for recovery */
#endif
program_state.something_worth_saving = 0; /* don't save */
g.program_state.something_worth_saving = 0; /* don't save */
#endif
#ifndef SAFERHANGUP
if (!program_state.done_hup++)
if (!g.program_state.done_hup++)
#endif
if (program_state.something_worth_saving)
if (g.program_state.something_worth_saving)
(void) dosave0();
if (iflags.window_inited)
exit_nhwindows((char *) 0);