diff --git a/src/dog.c b/src/dog.c index e14513fdb..6c7849f0b 100644 --- a/src/dog.c +++ b/src/dog.c @@ -791,8 +791,9 @@ keepdogs( mdrop_special_objs(mtmp); /* drop Amulet */ } else if (mtmp->meating || mtmp->mtrapped) { if (canseemon(mtmp)) - pline("%s is still %s.", Monnam(mtmp), - mtmp->meating ? "eating" : "trapped"); + pline_xy(mtmp->mx, mtmp->my, + "%s is still %s.", Monnam(mtmp), + mtmp->meating ? "eating" : "trapped"); stay_behind = TRUE; } else if (mon_has_amulet(mtmp)) { if (canseemon(mtmp)) @@ -1127,7 +1128,7 @@ tamedog( /* worst case, at least it'll be peaceful. */ if (givemsg && !mtmp->mpeaceful && canspotmon(mtmp)) { - pline("%s seems %s.", Monnam(mtmp), + pline_xy(mtmp->mx, mtmp->my, "%s seems %s.", Monnam(mtmp), Hallucination ? "really chill" : "more amiable"); givemsg = FALSE; /* don't give another message below */ } @@ -1162,8 +1163,9 @@ tamedog( boolean big_corpse = (obj->otyp == CORPSE && ismnum(obj->corpsenm) && mons[obj->corpsenm].msize > mtmp->data->msize); - pline("%s catches %s%s", Monnam(mtmp), the(xname(obj)), - !big_corpse ? "." : ", or vice versa!"); + pline_xy(mtmp->mx, mtmp->my, + "%s catches %s%s", Monnam(mtmp), the(xname(obj)), + !big_corpse ? "." : ", or vice versa!"); } else if (cansee(mtmp->mx, mtmp->my)) pline("%s.", Tobjnam(obj, "stop")); /* dog_eat expects a floor object */ @@ -1223,7 +1225,7 @@ tamedog( } if (givemsg && canspotmon(mtmp)) - pline("%s seems quite %s.", Monnam(mtmp), + pline_xy(mtmp->mx, mtmp->my, "%s seems quite %s.", Monnam(mtmp), Hallucination ? "approachable" : "friendly"); newsym(mtmp->mx, mtmp->my); @@ -1270,11 +1272,13 @@ wary_dog(struct monst *mtmp, boolean was_dead) if (!quietly && cansee(mtmp->mx, mtmp->my)) { if (haseyes(gy.youmonst.data)) { if (haseyes(mtmp->data)) - pline("%s %s to look you in the %s.", Monnam(mtmp), - mtmp->mpeaceful ? "seems unable" : "refuses", - body_part(EYE)); + pline_xy(mtmp->mx, mtmp->my, + "%s %s to look you in the %s.", Monnam(mtmp), + mtmp->mpeaceful ? "seems unable" : "refuses", + body_part(EYE)); else - pline("%s avoids your gaze.", Monnam(mtmp)); + pline_xy(mtmp->mx, mtmp->my, + "%s avoids your gaze.", Monnam(mtmp)); } } } else { @@ -1286,7 +1290,7 @@ wary_dog(struct monst *mtmp, boolean was_dead) if (!mtmp->mtame) { if (!quietly && canspotmon(mtmp)) - pline("%s %s.", Monnam(mtmp), + pline_xy(mtmp->mx, mtmp->my, "%s %s.", Monnam(mtmp), mtmp->mpeaceful ? "is no longer tame" : "has become feral"); newsym(mtmp->mx, mtmp->my); /* a life-saved monster might be leashed; diff --git a/src/dogmove.c b/src/dogmove.c index 1694eb8a6..a6ff8bce0 100644 --- a/src/dogmove.c +++ b/src/dogmove.c @@ -283,9 +283,9 @@ dog_eat(struct monst *mtmp, result won't be printed */ obj_name = distant_name(obj, doname); if (tunnels(mtmp->data)) - pline("%s digs in.", noit_Monnam(mtmp)); + pline_xy(mtmp->mx, mtmp->my, "%s digs in.", noit_Monnam(mtmp)); else - pline("%s %s %s.", noit_Monnam(mtmp), + pline_xy(mtmp->mx, mtmp->my, "%s %s %s.", noit_Monnam(mtmp), devour ? "devours" : "eats", obj_name); } else if (seeobj) { obj_name = distant_name(obj, doname); @@ -335,7 +335,7 @@ dog_starve(struct monst *mtmp) if (mtmp->mleashed && mtmp != u.usteed) Your("leash goes slack."); else if (cansee(mtmp->mx, mtmp->my)) - pline("%s starves.", Monnam(mtmp)); + pline_xy(mtmp->mx, mtmp->my, "%s starves.", Monnam(mtmp)); else You_feel("%s for a moment.", Hallucination ? "bummed" : "sad"); @@ -363,7 +363,8 @@ dog_hunger(struct monst *mtmp, struct edog *edog) return TRUE; } if (cansee(mtmp->mx, mtmp->my)) - pline("%s is confused from hunger.", Monnam(mtmp)); + pline_xy(mtmp->mx, mtmp->my, + "%s is confused from hunger.", Monnam(mtmp)); else if (couldsee(mtmp->mx, mtmp->my)) beg(mtmp); else @@ -1263,8 +1264,8 @@ dog_move( if (info[chi] & ALLOW_U) { if (mtmp->mleashed) { /* play it safe */ - pline("%s breaks loose of %s leash!", Monnam(mtmp), - mhis(mtmp)); + pline_xy(mtmp->mx, mtmp->my, "%s breaks loose of %s leash!", + Monnam(mtmp), mhis(mtmp)); m_unleash(mtmp, FALSE); } (void) mattacku(mtmp); @@ -1288,7 +1289,8 @@ dog_move( ? vobj_at(nix, niy) : 0; const char *what = o ? distant_name(o, doname) : something; - pline("%s %s reluctantly %s %s.", noit_Monnam(mtmp), + pline_xy(mtmp->mx, mtmp->my, "%s %s reluctantly %s %s.", + noit_Monnam(mtmp), vtense((char *) 0, locomotion(mtmp->data, "step")), (is_flyer(mtmp->data) || is_floater(mtmp->data)) ? "over" : "onto",