Merge branch 'NetHack-3.6'

diff --cc doc/Guidebook.mn
Simple merge

diff --cc doc/Guidebook.tex
Simple merge

diff --cc include/rm.h
Simple merge

diff --cc src/drawing.c
Simple merge

diff --cc src/mapglyph.c
index b6ec9f601bbb6aca5e67f74eb08078d9ac1e3209,d6a78bc2291d4e542909f683ee6af90a60d4e78d..912c003b636063654814d4c989d255f4999dc409
--- 1/src/mapglyph.c
--- 2/src/mapglyph.c
+++ b/src/mapglyph.c
@@@ -224,19 -224,23 +224,23 @@@ unsigned *ospecial
  
      /* These were requested by a blind player to enhance screen reader use */
      if (sysopt.accessibility == 1) {
-         ovsym = Is_rogue_level(&u.uz)
-                     ? g.ov_rogue_syms[SYM_PET_OVERRIDE + SYM_OFF_X]
-                     : g.ov_primary_syms[SYM_PET_OVERRIDE + SYM_OFF_X];
-         if (ovsym && (special & MG_PET))
-             idx = SYM_PET_OVERRIDE + SYM_OFF_X;
-         ovsym = Is_rogue_level(&u.uz)
-                     ? g.ov_rogue_syms[SYM_PLAYER_OVERRIDE + SYM_OFF_X]
-                     : g.ov_primary_syms[SYM_PLAYER_OVERRIDE + SYM_OFF_X];
-         if (ovsym && is_you)
-             idx = SYM_PLAYER_OVERRIDE + SYM_OFF_X;
+         int ovidx;
+ 
+         if ((special & MG_PET) != 0) {
+             ovidx = SYM_PET_OVERRIDE + SYM_OFF_X;
 -            if (Is_rogue_level(&u.uz) ? ov_rogue_syms[ovidx]
 -                                      : ov_primary_syms[ovidx])
++            if (Is_rogue_level(&u.uz) ? g.ov_rogue_syms[ovidx]
++                                      : g.ov_primary_syms[ovidx])
+                 idx = ovidx;
+         }
+         if (is_you) {
+             ovidx = SYM_HERO_OVERRIDE + SYM_OFF_X;
 -            if (Is_rogue_level(&u.uz) ? ov_rogue_syms[ovidx]
 -                                      : ov_primary_syms[ovidx])
++            if (Is_rogue_level(&u.uz) ? g.ov_rogue_syms[ovidx]
++                                      : g.ov_primary_syms[ovidx])
+                 idx = ovidx;
+         }
      }
  
 -    ch = showsyms[idx];
 +    ch = g.showsyms[idx];
  #ifdef TEXTCOLOR
      /* Turn off color if no color defined, or rogue level w/o PC graphics. */
      if (!has_color(color) || (Is_rogue_level(&u.uz) && !has_rogue_color))

diff --cc src/pager.c
index 2cbc893372ae900a885e2ed19e4a4a00f5d98432,647df5150dd884d0322e375d1dd708869809dc71..a0119aa2d89c095c9b909636c7f2b1a4d546e75f
--- 1/src/pager.c
--- 2/src/pager.c
+++ b/src/pager.c
@@@ -1058,23 -1058,23 +1058,23 @@@ struct permonst **for_supplement
                              nhsym save_override;
  
                              if (Is_rogue_level(&u.uz)) {
-                                 save_override = g.ov_rogue_syms[SYM_PET_OVERRIDE + SYM_OFF_X];
-                                 g.ov_rogue_syms[SYM_PET_OVERRIDE + SYM_OFF_X] = 0;
 -                                save_override = ov_rogue_syms[idx];
 -                                ov_rogue_syms[idx] = 0;
++                                save_override = g.ov_rogue_syms[idx];
++                                g.ov_rogue_syms[idx] = 0;
                              } else {
-                                 save_override = g.ov_primary_syms[SYM_PET_OVERRIDE + SYM_OFF_X];
-                                 g.ov_primary_syms[SYM_PET_OVERRIDE + SYM_OFF_X] = 0;
 -                                save_override = ov_primary_syms[idx];
 -                                ov_primary_syms[idx] = 0;
++                                save_override = g.ov_primary_syms[idx];
++                                g.ov_primary_syms[idx] = 0;
                              }
-                             /* convert to symbol without the override in effect */
+                             /* convert to symbol without override in effect */
                              (void) mapglyph(glyph, &sym, &oc, &os, cc.x, cc.y);
                              if (Is_rogue_level(&u.uz))
-                                 g.ov_rogue_syms[SYM_PET_OVERRIDE + SYM_OFF_X] = save_override;
 -                                ov_rogue_syms[idx] = save_override;
++                                g.ov_rogue_syms[idx] = save_override;
                              else
-                                 g.ov_primary_syms[SYM_PET_OVERRIDE + SYM_OFF_X] = save_override;
 -                                ov_primary_syms[idx] = save_override;
++                                g.ov_primary_syms[idx] = save_override;
                              goto check_monsters;
                          }
                          break;
-                 case SYM_PLAYER_OVERRIDE + SYM_OFF_X:
+                 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;
              }
          }