From: Bart House <bart@barthouse.com>
Date: Mon, 15 Jul 2019 04:16:27 +0000 (-0700)
Subject: Revert "Comment out nhassert() calls."
X-Git-Tag: v3.6.3.757eca7~111
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=04f4ac94cabb85b785e7544352ccbe6f167b7ecf;p=nethack

Revert "Comment out nhassert() calls."

This reverts commit 45a9c5eb14326521188457fe87a9d853b44a64ce.
---

diff --git a/win/tty/topl.c b/win/tty/topl.c
index 14e9bc548..bb79be26c 100644
--- a/win/tty/topl.c
+++ b/win/tty/topl.c
@@ -259,7 +259,7 @@ register const char *bp;
         && cw->cury == 0
         && n0 + (int) strlen(toplines) + 3 < CO - 8 /* room for --More-- */
         && (notdied = strncmp(bp, "You die", 7)) != 0) {
-        /* nhassert(strlen(toplines) == cw->curx); */
+        nhassert(strlen(toplines) == cw->curx);
         Strcat(toplines, "  ");
         Strcat(toplines, bp);
         cw->curx += 2;
@@ -313,7 +313,7 @@ char c;
         if (ttyDisplay->curx == 0 && ttyDisplay->cury > 0)
             tty_curs(BASE_WINDOW, CO, (int) ttyDisplay->cury - 1);
         backsp();
-        /* nhassert(ttyDisplay->curx > 0); */
+        nhassert(ttyDisplay->curx > 0);
         ttyDisplay->curx--;
         cw->curx = ttyDisplay->curx;
         return;
@@ -708,8 +708,8 @@ boolean restoring_msghist;
         dumplogmsg(toplines);
 #endif
     } else if (snapshot_mesgs) {
-        /* nhassert(ttyDisplay == NULL ||
-                 ttyDisplay->toplin != TOPLINE_NEED_MORE); */
+        nhassert(ttyDisplay == NULL ||
+                 ttyDisplay->toplin != TOPLINE_NEED_MORE);
 
         /* done putting arbitrary messages in; put the snapshot ones back */
         for (idx = 0; snapshot_mesgs[idx]; ++idx) {
diff --git a/win/tty/wintty.c b/win/tty/wintty.c
index 6d5042f8e..63861d62b 100644
--- a/win/tty/wintty.c
+++ b/win/tty/wintty.c
@@ -2321,7 +2321,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;
@@ -2409,7 +2409,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:
@@ -3164,7 +3164,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