]> granicus.if.org Git - nethack/commitdiff
Fix bz58: Inheritance dispute between shk and risen undead
authorPasi Kallinen <paxed@alt.org>
Fri, 29 Jan 2016 14:59:21 +0000 (16:59 +0200)
committerPasi Kallinen <paxed@alt.org>
Fri, 29 Jan 2016 14:59:27 +0000 (16:59 +0200)
Prevent shopkeeper from "gratefully inheriting all your possessions"
when your corpse rises as undead.

src/shk.c

index b2208d3998f722302f64e5a42a032dd6dd2577fc..ff9f8a44cddce5c13238a04c3f32f5c23d90da9e 100644 (file)
--- a/src/shk.c
+++ b/src/shk.c
@@ -1722,7 +1722,7 @@ int croaked;
     /* shopkeeper is peaceful, nothing stolen, nothing owed. */
     if (roomno == eshkp->shoproom && inhishop(shkp) && !eshkp->billct
         && !eshkp->robbed && !eshkp->debit && NOTANGRY(shkp)
-        && !eshkp->following) {
+        && !eshkp->following && u.ugrave_arise < LOW_PM) {
         taken = (invent != 0);
         if (taken)
             pline("%s gratefully inherits all your possessions.",