Merge branch 'NetHack-3.6'

win/tty/wintty.c

@@ -204,7 +204,7 @@ static boolean FDECL(check_fields, (BOOLEAN_P, int *));
 static void NDECL(render_status);
 static void FDECL(tty_putstatusfield, (const char *, int, int));
 static boolean NDECL(check_windowdata);
-static int NDECL(condition_size);
+static void NDECL(set_condition_length);
 static int FDECL(make_things_fit, (BOOLEAN_P));
 static void FDECL(shrink_enc, (int));
 static void FDECL(shrink_dlvl, (int));
@@ -3613,7 +3613,7 @@ char *posbar;
  *      and tries a few different ways to squish a representation
  *      of the status window values onto the 80 column tty display.
  *          ->check_fields()
- *          ->condition_size()  - get the width of all conditions
+ *          ->set_condition_length()  - update the width of conditions
  *          ->shrink_enc()      - shrink encumbrance message word
  *          ->shrink_dlvl()     - reduce the width of Dlvl:42
  *
@@ -3967,7 +3967,7 @@ static int
 make_things_fit(force_update)
 boolean force_update;
 {
-    int trycnt, fitting = 0, condsz, requirement;
+    int trycnt, fitting = 0, requirement;
     int rowsz[3], num_rows, condrow, otheroptions = 0;
 
     num_rows = (iflags.wc2_statuslines < 3) ? 2 : 3;
@@ -3977,7 +3977,7 @@ boolean force_update;
         shrink_enc(0);
     if (dlvl_shrinklvl > 0)
         shrink_dlvl(0);
-    condsz = condition_size();
+    set_condition_length();
     for (trycnt = 0; trycnt < 6 && !fitting; ++trycnt) {
         /* FIXME: this remeasures each line every time even though it
            is only attempting to shrink one of them and the other one
@@ -3995,7 +3995,7 @@ boolean force_update;
         if (trycnt < 2) {
             if (cond_shrinklvl < trycnt + 1) {
                 cond_shrinklvl = trycnt + 1;
-                condsz = condition_size();
+                set_condition_length();
             }
             continue;
         }
@@ -4217,13 +4217,12 @@ int x, y;
 }
 
 /* caller must set cond_shrinklvl (0..2) before calling us */
-static int
-condition_size()
+static void
+set_condition_length()
 {
     long mask;
-    int c, lth;
+    int c, lth = 0;
 
-    lth = 0;
     if (tty_condition_bits) {
         for (c = 0; c < SIZE(conditions); ++c) {
             mask = conditions[c].mask;
@@ -4232,7 +4231,6 @@ condition_size()
         }
     }
     tty_status[NOW][BL_CONDITION].lth = lth;
-    return lth;
 }
 
 static void