From 60f057ff8e14d740f807918a0db2baf154a63102 Mon Sep 17 00:00:00 2001
From: cohrs <cohrs>
Date: Sat, 29 Jun 2002 18:04:30 +0000
Subject: [PATCH] GOLDOBJ zero payment in money2mon backport of fix to
 slashem-Bugs-566538 from <Someone>.  money2mon only makes sense if called
 with a non-zero amount.

---
 doc/fixes34.1 | 1 +
 src/shk.c     | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/doc/fixes34.1 b/doc/fixes34.1
index c3568c7a1..e292ee147 100644
--- a/doc/fixes34.1
+++ b/doc/fixes34.1
@@ -126,6 +126,7 @@ naming an already wielded elven dagger "Sting" activates warning against orcs
 naming either of the wielded weapons unintentionally ends two-weapon combat
 Various nemesis monsters must resist stoning so their death messages make sense
 don't call DEBUG impossible in rn2 when a level 0 monster tries to cast a spell
+GOLDOBJ: don't call money2mon with 0 zero when killed by shopkeeper
 
 
 Platform- and/or Interface-Specific Fixes
diff --git a/src/shk.c b/src/shk.c
index 69ae12a35..7eeabc249 100644
--- a/src/shk.c
+++ b/src/shk.c
@@ -1666,7 +1666,7 @@ boolean croaked;
 		if (loss > umoney || !loss || roomno == eshkp->shoproom) {
 			eshkp->robbed -= umoney;
 			if (eshkp->robbed < 0L) eshkp->robbed = 0L;
-                        money2mon(shkp, umoney);
+                        if (umoney > 0) money2mon(shkp, umoney);
 #endif
 			flags.botl = 1;
 			pline("%s %s all your possessions.",
-- 
2.40.0