From: cohrs <cohrs>
Date: Wed, 20 Aug 2003 17:51:49 +0000 (+0000)
Subject: another unreachable message
X-Git-Tag: MOVE2GIT~1841
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=6c254ee5395ebf9a85560648888163ea8ba9e69d;p=nethack

another unreachable message
Correct the unreachable "snores" message From a bug report.
Applied to trunk only in hopes that beta8 might be the last for 3.4.2.
The fixes entry is generic since I'm sure other similar messages will be fixed.
---

diff --git a/doc/fixes35.0 b/doc/fixes35.0
index 106c80edf..1f3b81f8e 100644
--- a/doc/fixes35.0
+++ b/doc/fixes35.0
@@ -28,6 +28,7 @@ being confused and reading cursed scroll of charging drains your energy
 class genocide recognizes species name as an example of the class to
 	genocide (Martin Snyder)
 internals: use Is_box rather than explicitly checking what it checks
+fix some unreachable messages (either make then reachable or remove them)
 
 
 Platform- and/or Interface-Specific Fixes
diff --git a/src/shk.c b/src/shk.c
index 7137412a1..a3cdbb6f2 100644
--- a/src/shk.c
+++ b/src/shk.c
@@ -2570,12 +2570,13 @@ xchar x, y;
 		    dropped_container(obj, shkp, TRUE);
 		if (!obj->unpaid)
 		    obj->no_charge = 1;
-		if (!shkp->mcanmove) {
+		if (shkp->msleeping) {
+		    if(!rn2(3))
+			pline("%s snores indifferently.", Monnam(shkp));
+		} else {
 		    if(ANGRY(shkp) && !rn2(4))
 			pline("%s utters a curse.", Monnam(shkp));
 		    else pline("%s is indisposed.", Monnam(shkp));
-		} else if(!rn2(3)) {
-		    pline("%s snores indifferently.", Monnam(shkp));
 		}
 		subfrombill(obj, shkp);
 		return;