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

follow-up, program_state

Browse Source
This commit is contained in:
nhmall
2024-07-13 16:31:35 -04:00
parent 72d2b0414c
commit 0eb7f109e0
67 changed files with 255 additions and 252 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/pline.c
View File

@@ -157,10 +157,10 @@ vpline(const char *line, va_list the_args)
if (!line || !*line)
return;
#ifdef HANGUPHANDLING
if (svp.program_state.done_hup)
if (program_state.done_hup)
return;
#endif
if (svp.program_state.wizkit_wishing)
if (program_state.wizkit_wishing)
return;
if (a11y.accessiblemsg && isok(a11y.msg_loc.x,a11y.msg_loc.y)) {
@@ -542,7 +542,7 @@ raw_printf(const char *line, ...)
va_start(the_args, line);
vraw_printf(line, the_args);
va_end(the_args);
if (!svp.program_state.beyond_savefile_load)
if (!program_state.beyond_savefile_load)
ge.early_raw_messages++;
}
@@ -567,7 +567,7 @@ vraw_printf(const char *line, va_list the_args)
#if defined(MSGHANDLER)
execplinehandler(line);
#endif
if (!svp.program_state.beyond_savefile_load)
if (!program_state.beyond_savefile_load)
ge.early_raw_messages++;
}
@@ -579,10 +579,10 @@ impossible(const char *s, ...)
char pbuf2[BUFSZ];
va_start(the_args, s);
if (svp.program_state.in_impossible)
if (program_state.in_impossible)
panic("impossible called impossible");
svp.program_state.in_impossible = 1;
program_state.in_impossible = 1;
(void) vsnprintf(pbuf, sizeof pbuf, s, the_args);
va_end(the_args);
pbuf[BUFSZ - 1] = '\0'; /* sanity */
@@ -594,14 +594,14 @@ impossible(const char *s, ...)
pline("%s", pbuf);
gp.pline_flags = 0;
if (svp.program_state.in_sanity_check) {
if (program_state.in_sanity_check) {
/* skip rest of multi-line feedback */
svp.program_state.in_impossible = 0;
program_state.in_impossible = 0;
return;
}
Strcpy(pbuf2, "Program in disorder!");
if (svp.program_state.something_worth_saving)
if (program_state.something_worth_saving)
Strcat(pbuf2, " (Saving and reloading may fix this problem.)");
pline("%s", pbuf2);
pline("Please report these messages to %s.", DEVTEAM_EMAIL);
@@ -621,7 +621,7 @@ impossible(const char *s, ...)
}
#endif
svp.program_state.in_impossible = 0;
program_state.in_impossible = 0;
}
RESTORE_WARNING_FORMAT_NONLITERAL