diff --git a/src/mhitm.c b/src/mhitm.c index a65ed98d7..eb3bcccda 100644 --- a/src/mhitm.c +++ b/src/mhitm.c @@ -232,7 +232,7 @@ mdisplacem( 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)); + pline_mon(magr, "%s turns to stone!", Monnam(magr)); } monstone(magr); if (!DEADMONSTER(magr)) @@ -338,7 +338,7 @@ mattackm( } else { if (iflags.last_msg == PLNMSG_HIDE_UNDER && mdef->m_id == gl.last_hider) - pline("%s emerges from hiding.", Monnam(mdef)); + pline_mon(mdef, "%s emerges from hiding.", Monnam(mdef)); else if (mdef->m_id == gl.last_hider) You("notice %s.", mon_nam(mdef)); else @@ -771,7 +771,7 @@ gazemm(struct monst *magr, struct monst *mdef, struct attack *mattk) return M_ATTK_MISS; } if (canseemon(magr)) - pline("%s is turned to stone!", Monnam(magr)); + pline_mon(magr, "%s is turned to stone!", Monnam(magr)); monstone(magr); if (!DEADMONSTER(magr)) return M_ATTK_MISS; @@ -962,7 +962,7 @@ explmm(struct monst *magr, struct monst *mdef, struct attack *mattk) return M_ATTK_MISS; if (cansee(magr->mx, magr->my)) - pline("%s explodes!", Monnam(magr)); + pline_mon(magr, "%s explodes!", Monnam(magr)); else noises(magr, mattk); @@ -1033,7 +1033,7 @@ mdamagem( return M_ATTK_HIT; /* no damage during the polymorph */ } if (gv.vis && canspotmon(magr)) - pline("%s turns to stone!", Monnam(magr)); + pline_mon(magr, "%s turns to stone!", Monnam(magr)); monstone(magr); if (!DEADMONSTER(magr)) return M_ATTK_HIT; /* lifesaved */ @@ -1238,7 +1238,7 @@ slept_monst(struct monst *mon) { if (helpless(mon) && mon == u.ustuck && !sticks(gy.youmonst.data) && !u.uswallow) { - pline("%s grip relaxes.", s_suffix(Monnam(mon))); + pline_mon(mon, "%s grip relaxes.", s_suffix(Monnam(mon))); unstuck(mon); } } @@ -1382,14 +1382,14 @@ passivemm( case AD_COLD: if (resists_cold(magr)) { if (canseemon(magr)) { - pline("%s is mildly chilly.", Monnam(magr)); + pline_mon(magr, "%s is mildly chilly.", Monnam(magr)); golemeffects(magr, AD_COLD, tmp); } tmp = 0; break; } if (canseemon(magr)) - pline("%s is suddenly very cold!", Monnam(magr)); + pline_mon(magr, "%s is suddenly very cold!", Monnam(magr)); mdef->mhp += tmp / 2; if (mdef->mhpmax < mdef->mhp) mdef->mhpmax = mdef->mhp; @@ -1400,7 +1400,7 @@ passivemm( if (!magr->mstun) { magr->mstun = 1; if (canseemon(magr)) - pline("%s %s...", Monnam(magr), + pline_mon(magr, "%s %s...", Monnam(magr), makeplural(stagger(magr->data, "stagger"))); } tmp = 0; @@ -1408,26 +1408,27 @@ passivemm( case AD_FIRE: if (resists_fire(magr)) { if (canseemon(magr)) { - pline("%s is mildly warmed.", Monnam(magr)); + pline_mon(magr, "%s is mildly warmed.", Monnam(magr)); golemeffects(magr, AD_FIRE, tmp); } tmp = 0; break; } if (canseemon(magr)) - pline("%s is suddenly very hot!", Monnam(magr)); + pline_mon(magr, "%s is suddenly very hot!", Monnam(magr)); break; case AD_ELEC: if (resists_elec(magr)) { if (canseemon(magr)) { - pline("%s is mildly tingled.", Monnam(magr)); + pline_mon(magr, "%s is mildly tingled.", Monnam(magr)); golemeffects(magr, AD_ELEC, tmp); } tmp = 0; break; } if (canseemon(magr)) - pline("%s is jolted with electricity!", Monnam(magr)); + pline_mon(magr, "%s is jolted with electricity!", + Monnam(magr)); break; default: tmp = 0; @@ -1453,7 +1454,7 @@ xdrainenergym(struct monst *mon, boolean givemsg) || attacktype(mon->data, AT_BREA))) { mon->mspec_used += d(2, 2); if (givemsg) - pline("%s seems lethargic.", Monnam(mon)); + pline_mon(mon, "%s seems lethargic.", Monnam(mon)); } }