Fix bz58: Inheritance dispute between shk and risen undead

Prevent shopkeeper from "gratefully inheriting all your possessions"
when your corpse rises as undead.
This commit is contained in:
Pasi Kallinen
2016-01-29 16:59:21 +02:00
parent b606aea919
commit d591ebaa46

View File

@@ -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.",