Merge branch 'NetHack-3.6'

This commit is contained in:
nhmall
2019-07-13 00:38:10 -04:00
27 changed files with 123 additions and 89 deletions
+4 -4
View File
@@ -2319,7 +2319,7 @@ boolean blocking; /* with ttys, all windows are blocking */
more();
ttyDisplay->toplin = TOPLINE_NEED_MORE; /* more resets this */
tty_clear_nhwindow(window);
/* nhassert(ttyDisplay->toplin == TOPLINE_EMPTY); */
nhassert(ttyDisplay->toplin == TOPLINE_EMPTY);
} else
ttyDisplay->toplin = TOPLINE_EMPTY;
cw->curx = cw->cury = 0;
@@ -2407,7 +2407,7 @@ winid window;
case NHW_MESSAGE:
if (ttyDisplay->toplin != TOPLINE_EMPTY)
tty_display_nhwindow(WIN_MESSAGE, TRUE);
/* nhassert(ttyDisplay->toplin == TOPLINE_EMPTY); */
nhassert(ttyDisplay->toplin == TOPLINE_EMPTY);
/*FALLTHRU*/
case NHW_STATUS:
case NHW_BASE:
@@ -3162,7 +3162,7 @@ const char *mesg;
more();
ttyDisplay->toplin = TOPLINE_NEED_MORE; /* more resets this */
tty_clear_nhwindow(WIN_MESSAGE);
/* nhassert(ttyDisplay->toplin == TOPLINE_EMPTY); */
nhassert(ttyDisplay->toplin == TOPLINE_EMPTY);
}
/* normally <ESC> means skip further messages, but in this case
it means cancel the current prompt; any other messages should
@@ -4130,7 +4130,7 @@ boolean force_update;
* must be updated because they need to change.
* This is now done at an individual field case-by-case level.
*/
boolean
STATIC_OVL boolean
check_fields(forcefields, sz)
boolean forcefields;
int sz[3];