From: nhmall <nhmall@nethack.org>
Date: Sun, 24 Nov 2019 23:51:59 +0000 (-0500)
Subject: Merge branch 'NetHack-3.6'
X-Git-Tag: NetHack-3.7.0_WIP~241^2~1
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=b070cb10cad38b93d73eabb28bb8d58d864075a2;p=nethack

Merge branch 'NetHack-3.6'
---

b070cb10cad38b93d73eabb28bb8d58d864075a2
diff --cc src/do_wear.c
index 31d6e9be1,15959738d..67a9d6b75
--- a/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: