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:
@@ -1722,7 +1722,7 @@ int croaked;
|
|||||||
/* shopkeeper is peaceful, nothing stolen, nothing owed. */
|
/* shopkeeper is peaceful, nothing stolen, nothing owed. */
|
||||||
if (roomno == eshkp->shoproom && inhishop(shkp) && !eshkp->billct
|
if (roomno == eshkp->shoproom && inhishop(shkp) && !eshkp->billct
|
||||||
&& !eshkp->robbed && !eshkp->debit && NOTANGRY(shkp)
|
&& !eshkp->robbed && !eshkp->debit && NOTANGRY(shkp)
|
||||||
&& !eshkp->following) {
|
&& !eshkp->following && u.ugrave_arise < LOW_PM) {
|
||||||
taken = (invent != 0);
|
taken = (invent != 0);
|
||||||
if (taken)
|
if (taken)
|
||||||
pline("%s gratefully inherits all your possessions.",
|
pline("%s gratefully inherits all your possessions.",
|
||||||
|
|||||||
Reference in New Issue
Block a user