From: cohrs <cohrs>
Date: Sun, 13 Jul 2003 05:17:49 +0000 (+0000)
Subject: U537 - autosearching while digging a trapped statue
X-Git-Tag: MOVE2GIT~1902
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=567a501bddfcb6879e64ef0a025d8159d12fb639;p=nethack

U537 - autosearching while digging a trapped statue
Noticing a statue trap animate should stop your occupation.
That avoids the reported "You hit the  with all your might." message.
---

diff --git a/doc/fixes34.2 b/doc/fixes34.2
index a684f2357..be0876ea0 100644
--- a/doc/fixes34.2
+++ b/doc/fixes34.2
@@ -100,6 +100,7 @@ travel command caches last position to make non-mouse less painful
 update pit trapped time when polymorphing to or from a monster that passes_walls
 show artifact hit message which affect the monster that swallowed the hero
 revived pet corpse from bones file should not be loyal to current player
+finding a statue trap you are about to dig should stop your occupation
 
 
 Platform- and/or Interface-Specific Fixes
diff --git a/src/trap.c b/src/trap.c
index 383533de1..501f8947a 100644
--- a/src/trap.c
+++ b/src/trap.c
@@ -470,9 +470,11 @@ int *fail_reason;
 	} else if (cause == ANIMATE_SHATTER)
 	    pline("Instead of shattering, the statue suddenly %s!",
 		canspotmon(mon) ? "comes to life" : "disappears");
-	else /* cause == ANIMATE_NORMAL */
+	else { /* cause == ANIMATE_NORMAL */
 	    You("find %s posing as a statue.",
 		canspotmon(mon) ? a_monnam(mon) : something);
+	    stop_occupation();
+	}
 	/* avoid hiding under nothing */
 	if (x == u.ux && y == u.uy &&
 		Upolyd && hides_under(youmonst.data) && !OBJ_AT(x, y))