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
win/tty/getline.c
+1 -1
View File
@@ -218,7 +218,7 @@ register const char *s; /* chars allowed besides return */
morc = 0;
while (
#ifdef HANGUPHANDLING
!program_state.done_hup &&
!g.program_state.done_hup &&
#endif
(c = tty_nhgetch()) != EOF) {
if (c == '\n' || c == '\r')
win/tty/wintty.c
+3 -3
View File
@@ -56,7 +56,7 @@ extern short glyph2tile[];
*/
#define HUPSKIP() \
do { \
if (program_state.done_hup) { \
if (g.program_state.done_hup) { \
morc = '\033'; \
return; \
} \
@@ -64,7 +64,7 @@ extern short glyph2tile[];
/* morc=ESC - in case we bypass xwaitforspace() which sets that */
#define HUPSKIP_RESULT(RES) \
do { \
if (program_state.done_hup) \
if (g.program_state.done_hup) \
return (RES); \
} while (0)
#else /* !HANGUP_HANDLING */
@@ -3085,7 +3085,7 @@ tty_wait_synch()
if (ttyDisplay->inmore) {
addtopl("--More--");
(void) fflush(stdout);
} else if (ttyDisplay->inread > program_state.gameover) {
} else if (ttyDisplay->inread > g.program_state.gameover) {
/* this can only happen if we were reading and got interrupted */
ttyDisplay->toplin = 3;
/* do this twice; 1st time gets the Quit? message again */