From: cohrs <cohrs>
Date: Sat, 16 Nov 2002 05:31:23 +0000 (+0000)
Subject: Wand of digging in a shop crash
X-Git-Tag: MOVE2GIT~2332
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=330bdb7d1ad386825580dec3ef431e00f3f6d7e8;p=nethack

Wand of digging in a shop crash
From a bug report.  I haven't looked closely, but I think this bug is just
in the development code.  If you dig in a shop with a wand while carrying
unpaid stuff, the shopkeeper would grab your pack, including the wand but
w/o clearing current_wand.  It seems the right thing is to just not grab
the current_wand, since it's not in your pack while you're zapping it.
In 3.4.0, you lost the wand too.
---

diff --git a/src/shk.c b/src/shk.c
index 7974e75ed..0c506c11c 100644
--- a/src/shk.c
+++ b/src/shk.c
@@ -3377,6 +3377,7 @@ register int fall;
 		if ((obj->owornmask & ~(W_SWAPWEP|W_QUIVER)) != 0 ||
 			(obj == uswapwep && u.twoweap) ||
 			(obj->otyp == LEASH && obj->leashmon)) continue;
+		if (obj == current_wand) continue;
 		setnotworn(obj);
 		freeinv(obj);
 		subfrombill(obj, shkp);