From: nhmall <mjnh@persona.ca>
Date: Sat, 14 Mar 2015 13:43:07 +0000 (-0400)
Subject: Additional obstruction messaging fixup
X-Git-Tag: NetHack-3.6.0_RC01~604
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=f799bffbb2901b28e6ccd982db9e4d8e6fb56193;p=nethack

Additional obstruction messaging fixup
---

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);