From 3ffbfc724c4df10360fb2e04a058bd8656b507f5 Mon Sep 17 00:00:00 2001 From: Pasi Kallinen Date: Tue, 28 Jan 2025 21:26:06 +0200 Subject: [PATCH] Fix another impossible no_charge object Tame earth elemental picked up a no_charge object from a shop and moved it out of the shop, causing "no_charge obj not inside tended shop" impossible. Non-tame monsters picking up no_charge items cleared that bit, so make the same happen for pets. --- src/steal.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/steal.c b/src/steal.c index 89ac7c841..f90d66a55 100644 --- a/src/steal.c +++ b/src/steal.c @@ -650,11 +650,11 @@ mpickobj(struct monst *mtmp, struct obj *otmp) pline("%s out.", Tobjnam(otmp, "go")); snuff_otmp = TRUE; } + /* for hero owned object on shop floor, mtmp is taking possession + and if it's eventually dropped in a shop, shk will claim it */ + otmp->no_charge = 0; /* some object handling is only done if mtmp isn't a pet */ if (!mtmp->mtame) { - /* for hero owned object on shop floor, mtmp is taking possession - and if it's eventually dropped in a shop, shk will claim it */ - otmp->no_charge = 0; /* if monst is unseen, some info hero knows about this object becomes lost; continual pickup and drop by pets makes this too annoying if it is applied to them; when engulfed (where monster can't be seen