Merge branch 'NetHack-3.6.2'

2019-02-08 19:58:58 -05:00
parent a3527e7eab 8da50471fe
commit 0d63372a48
5 changed files with 75 additions and 130 deletions
@@ -312,7 +312,11 @@ curses_del_nhwin(winid wid)
                   wid);
        return;
    }
-
+    if (wid == MESSAGE_WIN) {
+         curses_teardown_messages();
+    } else if (wid == STATUS_WIN) {
+         curses_teardown_status();
+    }
    nhwins[wid].curwin = NULL;
    nhwins[wid].nhwin = -1;
 }
@@ -562,11 +566,11 @@ curses_alert_main_borders(boolean onoff)
 static boolean
 is_main_window(winid wid)
 {
-    if ((wid == MESSAGE_WIN) || (wid == MAP_WIN) || (wid == STATUS_WIN) || wid == INV_WIN) {
+    if (wid == MESSAGE_WIN || wid == MAP_WIN
+        || wid == STATUS_WIN || wid == INV_WIN)
        return TRUE;
-    } else {
-        return FALSE;
-    }
+
+    return FALSE;
 }