Merge branch 'NetHack-3.6'

diff --cc src/do_wear.c
index 31d6e9be19ecf4cbe3415ea76ae8c15f7136caef,15959738d03e7999a254c13111f5fd495375b11d..67a9d6b75657616cbf57f30fbf7de625b01a98a2
--- 1/src/do_wear.c
--- 2/src/do_wear.c
+++ b/src/do_wear.c
@@@ -389,12 -400,11 +396,11 @@@ Helmet_on(VOID_ARGS
          adj_abon(uarmh, uarmh->spe);
          break;
      case CORNUTHAUM:
-         /* people think marked wizards know what they're talking
-          * about, but it takes trained arrogance to pull it off,
-          * and the actual enchantment of the hat is irrelevant.
-          */
+         /* people think marked wizards know what they're talking about,
+            but it takes trained arrogance to pull it off, and the actual
+            enchantment of the hat is irrelevant */
          ABON(A_CHA) += (Role_if(PM_WIZARD) ? 1 : -1);
 -        context.botl = 1;
 +        g.context.botl = 1;
          makeknown(uarmh->otyp);
          break;
      case HELM_OF_OPPOSITE_ALIGNMENT: