Merge branch 'NetHack-3.6'

2019-06-20 10:18:32 -04:00
parent 3640c3c2b2 8bfe6f82f1
commit 2a5d7ed536
5 changed files with 51 additions and 26 deletions
--- a/win/curses/cursdial.c
+++ b/win/curses/cursdial.c
@@ -1025,8 +1025,11 @@ menu_win_size(nhmenu *menu)
    /* Try not to wrap headers/normal text lines if possible.  We can
       go wider than half the screen for this purpose if need be */

-    if ((maxheaderwidth > maxwidth) && (maxheaderwidth < (term_cols - 2))) {
-        maxwidth = maxheaderwidth;
+    if (maxheaderwidth > maxwidth) {
+        if (maxheaderwidth < (term_cols - 2))
+            maxwidth = maxheaderwidth;
+        else
+            maxwidth = term_cols - 2;
    }

    width = maxwidth;