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

Accessibility: message locations

Browse Source
This commit is contained in:
Pasi Kallinen
2024-06-14 13:33:48 +03:00
parent 24e06171db
commit a8099edca6
1 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/apply.c
+9 -3
View File
@@ -716,7 +716,7 @@ m_unleash(struct monst *mtmp, boolean feedback)
if (feedback) { if (feedback) {
if (canseemon(mtmp)) if (canseemon(mtmp))
pline("%s pulls free of %s leash!", Monnam(mtmp), mhis(mtmp)); pline_mon(mtmp, "%s pulls free of %s leash!", Monnam(mtmp), mhis(mtmp));
else else
Your("leash falls slack."); Your("leash falls slack.");
} }
@@ -946,7 +946,7 @@ check_leash(coordxy x, coordxy y)
if (!DEADMONSTER(mtmp)) if (!DEADMONSTER(mtmp))
u.uconduct.killer = save_pacifism; u.uconduct.killer = save_pacifism;
} else { } else {
pline("%s is choked by the leash!", Monnam(mtmp)); pline_mon(mtmp, "%s is choked by the leash!", Monnam(mtmp));
/* tameness eventually drops to 1 here (never 0) */ /* tameness eventually drops to 1 here (never 0) */
if (mtmp->mtame && rn2(mtmp->mtame)) if (mtmp->mtame && rn2(mtmp->mtame))
mtmp->mtame--; mtmp->mtame--;
@@ -1531,6 +1531,8 @@ splash_lit(struct obj *obj)
&& ((!is_flyer(mtmp->data) && !is_floater(mtmp->data)) && ((!is_flyer(mtmp->data) && !is_floater(mtmp->data))
|| Is_waterlevel(&u.uz))); || Is_waterlevel(&u.uz)));
snuff = FALSE; snuff = FALSE;
if (useeit)
set_msg_xy(x, y);
} }
if (useeit || uhearit) if (useeit || uhearit)
@@ -1576,11 +1578,14 @@ catch_lit(struct obj *obj)
&& obj->cursed && !rn2(2)) && obj->cursed && !rn2(2))
return FALSE; return FALSE;
if (obj->where == OBJ_INVENT || cansee(x, y)) if (obj->where == OBJ_INVENT || cansee(x, y)) {
if (obj->where == OBJ_FLOOR && cansee(x, y))
set_msg_xy(x, y);
pline("%s %s %s", Yname2(obj), pline("%s %s %s", Yname2(obj),
/* "catches light!" or "feels warm." */ /* "catches light!" or "feels warm." */
otense(obj, Blind ? "feel" : "catch"), otense(obj, Blind ? "feel" : "catch"),
Blind ? "warm." : "light!"); Blind ? "warm." : "light!");
}
if (obj->otyp == POT_OIL) if (obj->otyp == POT_OIL)
makeknown(obj->otyp); makeknown(obj->otyp);
if (carried(obj) && obj->unpaid && costly_spot(u.ux, u.uy)) { if (carried(obj) && obj->unpaid && costly_spot(u.ux, u.uy)) {
@@ -2434,6 +2439,7 @@ fig_transform(anything *arg, long timeout)
case OBJ_FLOOR: case OBJ_FLOOR:
if (cansee_spot && !silent) { if (cansee_spot && !silent) {
set_msg_xy(cc.x, cc.y);
if (suppress_see) if (suppress_see)
pline("%s suddenly vanishes!", an(xname(figurine))); pline("%s suddenly vanishes!", an(xname(figurine)));
else else