From: cohrs <cohrs>
Date: Mon, 1 Apr 2002 00:20:58 +0000 (+0000)
Subject: comment bit
X-Git-Tag: MOVE2GIT~2836
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=587fe0b9e711e64896cc0cfb5dde3969eb8ff474;p=nethack

comment bit
- the dropx comment has been wrong for a while, time to accept that
---

diff --git a/doc/fixes34.1 b/doc/fixes34.1
index bc06dcfc5..8a589aab9 100644
--- a/doc/fixes34.1
+++ b/doc/fixes34.1
@@ -41,6 +41,7 @@ taking partial count of merged objects from a container while your pack
 animal_parts are not always appropriate for ravens
 prevent panic if tombstone window cannot be created
 clarify travel command behavior in the Guidebook
+touch_artifact checks needed when snagging w/bullwhip and stealing
 
 
 Platform- and/or Interface-Specific Fixes
diff --git a/src/apply.c b/src/apply.c
index 6eaf53dd4..f1d2bef1b 100644
--- a/src/apply.c
+++ b/src/apply.c
@@ -2267,7 +2267,10 @@ struct obj *obj;
 			pline("Snatching %s is a fatal mistake.", kbuf);
 			instapetrify(kbuf);
 		    }
-		    otmp = hold_another_object(otmp, "You drop %s!",
+		    if (!touch_artifact(otmp, &youmonst))
+			dropy(otmp);
+		    else
+			otmp = hold_another_object(otmp, "You drop %s!",
 					       doname(otmp), (const char *)0);
 		    break;
 		default:
diff --git a/src/uhitm.c b/src/uhitm.c
index 2ebb86be0..4c322a0c5 100644
--- a/src/uhitm.c
+++ b/src/uhitm.c
@@ -1111,6 +1111,10 @@ struct attack *mattk;
 		    pline("%s finishes taking off %s suit.",
 			  Monnam(mdef), mhis(mdef));
 	    }
+	    if (!touch_artifact(otmp, &youmonst)) {
+		dropy(otmp);
+		continue;
+	    }
 	    /* give the object to the character */
 	    otmp = hold_another_object(otmp, "You steal %s.",
 				       doname(otmp), "You steal: ");