Merge branch 'NetHack-3.6'

diff --cc src/pager.c
index ab2e154d0a888cd5ab539b20c66b8ab23fa2794b,77cff068b440abcad7e27251e599f1f3385bb33b..3f37fd1eb8b0c811d9e3e4104a9a173aefd601f5
--- 1/src/pager.c
--- 2/src/pager.c
+++ b/src/pager.c
@@@ -1039,32 -1039,33 +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) ? g.ov_rogue_syms[j] : g.ov_primary_syms[j];                    
 -        tmpsym = Is_rogue_level(&u.uz) ? ov_rogue_syms[j]
 -                                       : ov_primary_syms[j];
++        tmpsym = Is_rogue_level(&u.uz) ? g.ov_rogue_syms[j]
++                                       : g.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 = g.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];
++                sym = g.showsyms[S_HUMAN + SYM_OFF_M];
+                 goto check_monsters;
              }
          }
      }