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

Comment out nhassert() calls.

Browse Source
This commit is contained in:
Bart House
2019-07-11 21:23:12 -07:00
parent 1db45c8016
commit 45a9c5eb14
2 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
win/tty/topl.c
+4 -4
View File
@@ -259,7 +259,7 @@ register const char *bp;
&& cw->cury == 0 && cw->cury == 0
&& n0 + (int) strlen(toplines) + 3 < CO - 8 /* room for --More-- */ && n0 + (int) strlen(toplines) + 3 < CO - 8 /* room for --More-- */
&& (notdied = strncmp(bp, "You die", 7)) != 0) { && (notdied = strncmp(bp, "You die", 7)) != 0) {
nhassert(strlen(toplines) == cw->curx); /* nhassert(strlen(toplines) == cw->curx); */
Strcat(toplines, " "); Strcat(toplines, " ");
Strcat(toplines, bp); Strcat(toplines, bp);
cw->curx += 2; cw->curx += 2;
@@ -313,7 +313,7 @@ char c;
if (ttyDisplay->curx == 0 && ttyDisplay->cury > 0) if (ttyDisplay->curx == 0 && ttyDisplay->cury > 0)
tty_curs(BASE_WINDOW, CO, (int) ttyDisplay->cury - 1); tty_curs(BASE_WINDOW, CO, (int) ttyDisplay->cury - 1);
backsp(); backsp();
nhassert(ttyDisplay->curx > 0); /* nhassert(ttyDisplay->curx > 0); */
ttyDisplay->curx--; ttyDisplay->curx--;
cw->curx = ttyDisplay->curx; cw->curx = ttyDisplay->curx;
return; return;
@@ -708,8 +708,8 @@ boolean restoring_msghist;
dumplogmsg(toplines); dumplogmsg(toplines);
#endif #endif
} else if (snapshot_mesgs) { } else if (snapshot_mesgs) {
nhassert(ttyDisplay == NULL || /* nhassert(ttyDisplay == NULL ||
ttyDisplay->toplin != TOPLINE_NEED_MORE); ttyDisplay->toplin != TOPLINE_NEED_MORE); */
/* done putting arbitrary messages in; put the snapshot ones back */ /* done putting arbitrary messages in; put the snapshot ones back */
for (idx = 0; snapshot_mesgs[idx]; ++idx) { for (idx = 0; snapshot_mesgs[idx]; ++idx) {
win/tty/wintty.c
+3 -3
View File
@@ -2321,7 +2321,7 @@ boolean blocking; /* with ttys, all windows are blocking */
more(); more();
ttyDisplay->toplin = TOPLINE_NEED_MORE; /* more resets this */ ttyDisplay->toplin = TOPLINE_NEED_MORE; /* more resets this */
tty_clear_nhwindow(window); tty_clear_nhwindow(window);
nhassert(ttyDisplay->toplin == TOPLINE_EMPTY); /* nhassert(ttyDisplay->toplin == TOPLINE_EMPTY); */
} else } else
ttyDisplay->toplin = TOPLINE_EMPTY; ttyDisplay->toplin = TOPLINE_EMPTY;
cw->curx = cw->cury = 0; cw->curx = cw->cury = 0;
@@ -2409,7 +2409,7 @@ winid window;
case NHW_MESSAGE: case NHW_MESSAGE:
if (ttyDisplay->toplin != TOPLINE_EMPTY) if (ttyDisplay->toplin != TOPLINE_EMPTY)
tty_display_nhwindow(WIN_MESSAGE, TRUE); tty_display_nhwindow(WIN_MESSAGE, TRUE);
nhassert(ttyDisplay->toplin == TOPLINE_EMPTY); /* nhassert(ttyDisplay->toplin == TOPLINE_EMPTY); */
/*FALLTHRU*/ /*FALLTHRU*/
case NHW_STATUS: case NHW_STATUS:
case NHW_BASE: case NHW_BASE:
@@ -3164,7 +3164,7 @@ const char *mesg;
more(); more();
ttyDisplay->toplin = TOPLINE_NEED_MORE; /* more resets this */ ttyDisplay->toplin = TOPLINE_NEED_MORE; /* more resets this */
tty_clear_nhwindow(WIN_MESSAGE); 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 /* normally <ESC> means skip further messages, but in this case
it means cancel the current prompt; any other messages should it means cancel the current prompt; any other messages should