From f799bffbb2901b28e6ccd982db9e4d8e6fb56193 Mon Sep 17 00:00:00 2001 From: nhmall Date: Sat, 14 Mar 2015 09:43:07 -0400 Subject: [PATCH] Additional obstruction messaging fixup --- src/lock.c | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/src/lock.c b/src/lock.c index b57d9eb85..3de76fe66 100644 --- a/src/lock.c +++ b/src/lock.c @@ -627,14 +627,21 @@ register int x, y; boolean quietly; { register struct monst *mtmp = m_at(x, y); - boolean is_worm_tail = ((mtmp->mx != x) || (mtmp->my != y)); if(mtmp && mtmp->m_ap_type != M_AP_FURNITURE) { if (mtmp->m_ap_type == M_AP_OBJECT) goto objhere; - if (!quietly) pline("%s %s in the way!", - is_worm_tail ? "Something" : - !canspotmon(mtmp) ? "Some creature" : Monnam(mtmp), - slithy(mtmp->data) ? "is situated" : "stands"); + if (!quietly) { + if ((mtmp->mx != x) || (mtmp->my != y)) { + /* worm tail */ + pline("%s%s blocks the way!", + !canspotmon(mtmp) ? Something : + s_suffix(Monnam(mtmp)), + !canspotmon(mtmp) ? "" : " tail"); + } else { + pline("%s blocks the way!", + !canspotmon(mtmp) ? "Some creature" : Monnam(mtmp)); + } + } if (!canspotmon(mtmp)) map_invisible(x, y); return(TRUE); -- 2.40.0