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

14
src/save.c
View File

@@ -66,7 +66,7 @@ static struct save_procs {
};
#if defined(UNIX) || defined(VMS) || defined(__EMX__) || defined(WIN32)
#define HUP if (!program_state.done_hup)
#define HUP if (!g.program_state.done_hup)
#else
#define HUP
#endif
@@ -85,7 +85,7 @@ dosave()
clear_nhwindow(WIN_MESSAGE);
pline("Saving...");
#if defined(UNIX) || defined(VMS) || defined(__EMX__)
program_state.done_hup = 0;
g.program_state.done_hup = 0;
#endif
if (dosave0()) {
u.uhp = -1; /* universal game's over indicator */
@@ -120,7 +120,7 @@ dosave0()
if (iflags.save_uburied)
u.uburied = 1, iflags.save_uburied = 0;
if (!program_state.something_worth_saving || !SAVEF[0])
if (!g.program_state.something_worth_saving || !SAVEF[0])
return 0;
fq_save = fqname(SAVEF, SAVEPREFIX, 1); /* level files take 0 */
@@ -269,7 +269,7 @@ dosave0()
delete_levelfile(0);
nh_compress(fq_save);
/* this should probably come sooner... */
program_state.something_worth_saving = 0;
g.program_state.something_worth_saving = 0;
return 1;
}
@@ -726,7 +726,7 @@ register unsigned num;
if (failed) {
#if defined(UNIX) || defined(VMS) || defined(__EMX__)
if (program_state.done_hup)
if (g.program_state.done_hup)
nh_terminate(EXIT_FAILURE);
else
#endif
@@ -832,7 +832,7 @@ register int fd;
if (outbufp) {
if (write(fd, outbuf, outbufp) != outbufp) {
#if defined(UNIX) || defined(VMS) || defined(__EMX__)
if (program_state.done_hup)
if (g.program_state.done_hup)
nh_terminate(EXIT_FAILURE);
else
#endif
@@ -858,7 +858,7 @@ register unsigned num;
#endif
if ((unsigned) write(fd, loc, num) != num) {
#if defined(UNIX) || defined(VMS) || defined(__EMX__)
if (program_state.done_hup)
if (g.program_state.done_hup)
nh_terminate(EXIT_FAILURE);
else
#endif