From: nethack.allison <nethack.allison>
Date: Sun, 6 Jul 2003 14:13:06 +0000 (+0000)
Subject: B04002 fix for misplaced pet loyalty
X-Git-Tag: MOVE2GIT~1909
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=3f7873514e00fa77050ac0fddad804c72fb3ea25;p=nethack

B04002 fix for misplaced pet loyalty

<Someone> wrote:
>This _must_ be a bug: if a character leaves a pet corpse in a
>bonesfile, someone getting those bones will receive
>"So this is how you repay loyalty?"  should he sacrifice it, even
>though the loyalty wasn't shown to _him_."

Clear the appropriate fields from the attached monst structure
when loading bones.
---

diff --git a/doc/fixes34.2 b/doc/fixes34.2
index 436409b40..a041b47c0 100644
--- a/doc/fixes34.2
+++ b/doc/fixes34.2
@@ -99,6 +99,7 @@ stethoscope use should be free the first time it's use per player move
 travel command caches last position to make non-mouse less painful
 update pit trapped time when polymorphing to or from a monster that passes_walls
 show artifact hit message which affect the monster that swallowed the hero
+revived pet corpse from bones file should not be loyal to current player
 
 
 Platform- and/or Interface-Specific Fixes
diff --git a/src/restore.c b/src/restore.c
index aabcad5aa..2ad6617d6 100644
--- a/src/restore.c
+++ b/src/restore.c
@@ -974,6 +974,7 @@ boolean ghostly;
 	    struct monst *mtmp = (struct monst *)otmp->oextra;
 
 	    mtmp->m_id = 0;
+	    mtmp->mpeaceful = mtmp->mtame = 0;	/* pet's owner died! */
 	}
 	if (ghostly && otmp->oattached == OATTACHED_M_ID) {
 	    (void) memcpy((genericptr_t)&oldid, (genericptr_t)otmp->oextra,