]> granicus.if.org Git - nethack/commitdiff
comment bit
authorcohrs <cohrs>
Mon, 1 Apr 2002 00:20:58 +0000 (00:20 +0000)
committercohrs <cohrs>
Mon, 1 Apr 2002 00:20:58 +0000 (00:20 +0000)
- the dropx comment has been wrong for a while, time to accept that

doc/fixes34.1
src/apply.c
src/uhitm.c

index bc06dcfc564a9eb6683f21505afd0905721aa81c..8a589aab9d4c6d000dd1aee89d216a01333e507b 100644 (file)
@@ -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
index 6eaf53dd4777a0013f15793d6658d25756758831..f1d2bef1b4d9485c4d46a755d31ddb8413eb36e7 100644 (file)
@@ -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:
index 2ebb86be0e43e7cc15c0f54817ab2ecd4b868e8b..4c322a0c5b963a44482bc527165e95af6c264bc4 100644 (file)
@@ -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: ");