From: nhmall <nhmall@nethack.org>
Date: Sat, 28 May 2022 23:42:21 +0000 (-0400)
Subject: Merge branch 'pr775' into NetHack-3.7
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=0ce9d3a1e9f64c673cd808fe0534c10533c24e58;p=nethack

Merge branch 'pr775' into NetHack-3.7
---

0ce9d3a1e9f64c673cd808fe0534c10533c24e58
diff --cc src/mon.c
index cc0d6bab8,b4f0d96d2..0623986a2
--- a/src/mon.c
+++ b/src/mon.c
@@@ -3811,7 -3808,7 +3811,7 @@@ normal_shape(struct monst *mon
      if (mcham >= LOW_PM) {
          unsigned mcan = mon->mcan;
  
-         (void) newcham(mon, &mons[mcham], NO_NC_FLAGS);
 -        (void) newcham(mon, &mons[mcham], FALSE, TRUE);
++        (void) newcham(mon, &mons[mcham], NC_SHOW_MSG);
          mon->cham = NON_PM;
          /* newcham() may uncancel a polymorphing monster; override that */
          if (mcan)
diff --cc src/muse.c
index 10e453a1f,0b5d0446b..9d36506e7
--- a/src/muse.c
+++ b/src/muse.c
@@@ -2143,7 -2143,7 +2143,8 @@@ use_misc(struct monst* mtmp
          return 2;
      case MUSE_WAN_POLYMORPH:
          mzapwand(mtmp, otmp, TRUE);
-         (void) newcham(mtmp, muse_newcham_mon(mtmp), NC_VIA_WAND_OR_SPELL);
 -        (void) newcham(mtmp, muse_newcham_mon(mtmp), TRUE, TRUE);
++        (void) newcham(mtmp, muse_newcham_mon(mtmp),
++                       NC_VIA_WAND_OR_SPELL | NC_SHOW_MSG);
          if (oseen)
              makeknown(WAN_POLYMORPH);
          return 2;
@@@ -2152,7 -2152,7 +2153,7 @@@
          m_useup(mtmp, otmp);
          if (vismon)
              pline("%s suddenly mutates!", Monnam(mtmp));
-         (void) newcham(mtmp, muse_newcham_mon(mtmp), NO_NC_FLAGS);
 -        (void) newcham(mtmp, muse_newcham_mon(mtmp), FALSE, TRUE);
++        (void) newcham(mtmp, muse_newcham_mon(mtmp), NC_SHOW_MSG);
          if (oseen)
              makeknown(POT_POLYMORPH);
          return 2;
@@@ -2179,7 -2179,7 +2180,7 @@@
              worm_move(mtmp);
          newsym(g.trapx, g.trapy);
  
-         (void) newcham(mtmp, (struct permonst *) 0, NO_NC_FLAGS);
 -        (void) newcham(mtmp, (struct permonst *) 0, FALSE, TRUE);
++        (void) newcham(mtmp, (struct permonst *) 0, NC_SHOW_MSG);
          return 2;
      case MUSE_BAG:
          return mloot_container(mtmp, otmp, vismon);
diff --cc src/trap.c
index 66ae64e03,520b3a82c..bfe59d98e
--- a/src/trap.c
+++ b/src/trap.c
@@@ -2166,8 -2166,7 +2166,7 @@@ trapeffect_poly_trap
          if (resists_magm(mtmp)) {
              shieldeff(mtmp->mx, mtmp->my);
          } else if (!resist(mtmp, WAND_CLASS, 0, NOTELL)) {
-             (void) newcham(mtmp, (struct permonst *) 0,
-                            in_sight ? NC_SHOW_MSG : NO_NC_FLAGS);
 -            (void) newcham(mtmp, (struct permonst *) 0, FALSE, TRUE);
++            (void) newcham(mtmp, (struct permonst *) 0, NC_SHOW_MSG);
              if (in_sight)
                  seetrap(trap);
          }
@@@ -2618,7 -2617,7 +2617,7 @@@ steedintrap(struct trap* trap, struct o
          if (!resists_magm(steed) && !resist(steed, WAND_CLASS, 0, NOTELL)) {
              struct permonst *mdat = steed->data;
  
-             (void) newcham(steed, (struct permonst *) 0, NO_NC_FLAGS);
 -            (void) newcham(steed, (struct permonst *) 0, FALSE, TRUE);
++            (void) newcham(steed, (struct permonst *) 0, NC_SHOW_MSG);
              if (!can_saddle(steed) || !can_ride(steed)) {
                  dismount_steed(DISMOUNT_POLY);
              } else {