nethack-gwaa-kiwi/nethack
1
0
Fork 0
Code Pull Requests Activity

Merge branch 'cancel-revert-msg' of https://github.com/copperwater/NetHack into pr775

Browse Source
This commit is contained in:
nhmall
2022-05-28 19:33:11 -04:00
parent ef9d874c22 218a6a9d25
commit 67f80848bd
3 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/mon.c
View File

@@ -3808,7 +3808,7 @@ normal_shape(struct monst *mon)
if (mcham >= LOW_PM) {
unsigned mcan = mon->mcan;
(void) newcham(mon, &mons[mcham], FALSE, FALSE);
(void) newcham(mon, &mons[mcham], FALSE, TRUE);
mon->cham = NON_PM;
/* newcham() may uncancel a polymorphing monster; override that */
if (mcan)

6
src/muse.c
View File

@@ -2143,7 +2143,7 @@ use_misc(struct monst* mtmp)
return 2;
case MUSE_WAN_POLYMORPH:
mzapwand(mtmp, otmp, TRUE);
(void) newcham(mtmp, muse_newcham_mon(mtmp), TRUE, FALSE);
(void) newcham(mtmp, muse_newcham_mon(mtmp), TRUE, TRUE);
if (oseen)
makeknown(WAN_POLYMORPH);
return 2;
@@ -2152,7 +2152,7 @@ use_misc(struct monst* mtmp)
m_useup(mtmp, otmp);
if (vismon)
pline("%s suddenly mutates!", Monnam(mtmp));
(void) newcham(mtmp, muse_newcham_mon(mtmp), FALSE, FALSE);
(void) newcham(mtmp, muse_newcham_mon(mtmp), FALSE, TRUE);
if (oseen)
makeknown(POT_POLYMORPH);
return 2;
@@ -2179,7 +2179,7 @@ use_misc(struct monst* mtmp)
worm_move(mtmp);
newsym(g.trapx, g.trapy);
(void) newcham(mtmp, (struct permonst *) 0, FALSE, FALSE);
(void) newcham(mtmp, (struct permonst *) 0, FALSE, TRUE);
return 2;
case MUSE_BAG:
return mloot_container(mtmp, otmp, vismon);

4
src/trap.c
View File

@@ -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, FALSE, in_sight);
(void) newcham(mtmp, (struct permonst *) 0, FALSE, TRUE);
if (in_sight)
seetrap(trap);
}
@@ -2617,7 +2617,7 @@ steedintrap(struct trap* trap, struct obj* otmp)
if (!resists_magm(steed) && !resist(steed, WAND_CLASS, 0, NOTELL)) {
struct permonst *mdat = steed->data;
(void) newcham(steed, (struct permonst *) 0, FALSE, FALSE);
(void) newcham(steed, (struct permonst *) 0, FALSE, TRUE);
if (!can_saddle(steed) || !can_ride(steed)) {
dismount_steed(DISMOUNT_POLY);
} else {