diff --git a/doc/fixes3-7-0.txt b/doc/fixes3-7-0.txt index 9f885d4cb..ff70b1db9 100644 --- a/doc/fixes3-7-0.txt +++ b/doc/fixes3-7-0.txt @@ -1799,6 +1799,7 @@ split adjusting attributes into separate function (pr #757 by argrath) split getting damages with a kick into separate function (pr #758 by argrath) split fixing curse trouble into separate function (pr #765 by argrath) Handle -eaux plurals in makeplural/makesingular (pr #767 by entrez) +mdisplacem stoning and gloves had test backwards (pr #773 by entrez) Code Cleanup and Reorganization diff --git a/src/mhitm.c b/src/mhitm.c index 318aa75fa..c20e1e7f1 100644 --- a/src/mhitm.c +++ b/src/mhitm.c @@ -226,13 +226,18 @@ mdisplacem(register struct monst *magr, register struct monst *mdef, g.vis = (canspotmon(magr) && canspotmon(mdef)); if (touch_petrifies(pd) && !resists_ston(magr)) { - if (which_armor(magr, W_ARMG) != 0) { + if (!which_armor(magr, W_ARMG)) { if (poly_when_stoned(pa)) { mon_to_stone(magr); return MM_HIT; /* no damage during the polymorph */ } - if (!quietly && canspotmon(magr)) + if (!quietly && canspotmon(magr)) { + if (g.vis) { + pline("%s tries to move %s out of %s way.", Monnam(magr), + mon_nam(mdef), is_rider(pa) ? "the" : mhis(magr)); + } pline("%s turns to stone!", Monnam(magr)); + } monstone(magr); if (!DEADMONSTER(magr)) return MM_HIT; /* lifesaved */