ensure touch_artifact is always called via hold_another_object
- remove the touch_artifact calls just added - put a check into hold_another_object itself, based on the complete check removed from makewish
This commit is contained in:
@@ -1115,13 +1115,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: ");
|
||||
if (otmp->where != OBJ_INVENT) continue;
|
||||
if (otmp->otyp == CORPSE &&
|
||||
touch_petrifies(&mons[otmp->corpsenm]) && !uarmg) {
|
||||
char kbuf[BUFSZ];
|
||||
|
||||
Reference in New Issue
Block a user