From: PatR <rankin@nethack.org>
Date: Sun, 17 Nov 2019 17:25:26 +0000 (-0800)
Subject: pager warning fix and formatting
X-Git-Tag: NetHack-3.6.3.beta1.2019.11.17~8
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=9ea7b074fe89f9252618e97dad5e472cf9c6527e;p=nethack

pager warning fix and formatting

The mapglyph() change made a variable obsolete but it got left in
(idx = SYM_PET_OVERRIDE...).  Take it out and fix up the formatting
for the block of code that had it.
---

diff --git a/src/pager.c b/src/pager.c
index a7a3b2006..77cff068b 100644
--- a/src/pager.c
+++ b/src/pager.c
@@ -1,4 +1,4 @@
-/* NetHack 3.6	pager.c	$NHDT-Date: 1573943502 2019/11/16 22:31:42 $  $NHDT-Branch: NetHack-3.6 $:$NHDT-Revision: 1.159 $ */
+/* NetHack 3.6	pager.c	$NHDT-Date: 1574011494 2019/11/17 17:24:54 $  $NHDT-Branch: NetHack-3.6 $:$NHDT-Revision: 1.161 $ */
 /* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */
 /*-Copyright (c) Robert Patrick Rankin, 2018. */
 /* NetHack may be freely redistributed.  See license for details. */
@@ -1039,32 +1039,33 @@ struct permonst **for_supplement;
     for (j = SYM_OFF_X; j < SYM_MAX; ++j) {
         if (j == (SYM_INVISIBLE + SYM_OFF_X))
             continue;       /* already handled above */
-        tmpsym = Is_rogue_level(&u.uz) ? ov_rogue_syms[j] : ov_primary_syms[j];                    
+        tmpsym = Is_rogue_level(&u.uz) ? ov_rogue_syms[j]
+                                       : ov_primary_syms[j];
         if (tmpsym && sym == tmpsym) {
-            switch(j) {
-                case SYM_BOULDER + SYM_OFF_X:
-                        if (!found) {
-                            *firstmatch = "boulder";
-                            Sprintf(out_str, "%s%s", prefix, an(*firstmatch));
-                            found++;
-                        } else {
-                            found += append_str(out_str, "boulder");
-                        }
-                        break;
-                case SYM_PET_OVERRIDE + SYM_OFF_X:
-                        if (looked) {
-                            int oc = 0, idx = SYM_PET_OVERRIDE + SYM_OFF_X;
-                            unsigned os = 0;
-
-                            /* convert to symbol without override in effect */
-                            (void) mapglyph(glyph, &sym, &oc, &os,
-                                                cc.x, cc.y, MG_FLAG_NOOVERRIDE);
-                            goto check_monsters;
-                        }
-                        break;
-                case SYM_HERO_OVERRIDE + SYM_OFF_X:
-                        sym = showsyms[S_HUMAN + SYM_OFF_M];
-                        goto check_monsters;
+            switch (j) {
+            case SYM_BOULDER + SYM_OFF_X:
+                if (!found) {
+                    *firstmatch = "boulder";
+                    Sprintf(out_str, "%s%s", prefix, an(*firstmatch));
+                    found++;
+                } else {
+                    found += append_str(out_str, "boulder");
+                }
+                break;
+            case SYM_PET_OVERRIDE + SYM_OFF_X:
+                if (looked) {
+                    int oc = 0;
+                    unsigned os = 0;
+
+                    /* convert to symbol without override in effect */
+                    (void) mapglyph(glyph, &sym, &oc, &os,
+                                    cc.x, cc.y, MG_FLAG_NOOVERRIDE);
+                    goto check_monsters;
+                }
+                break;
+            case SYM_HERO_OVERRIDE + SYM_OFF_X:
+                sym = showsyms[S_HUMAN + SYM_OFF_M];
+                goto check_monsters;
             }
         }
     }