leashed steed dying of starvation

- prefer the regular "dies from hunger" message over "leash goes slack"
in this case.

diff --git a/doc/fixes34.1 b/doc/fixes34.1
index 72dd1c821c82d4eae9ccfe15f2ca592dc5606949..7137dce007d7374079045d879a8c22d0796864ce 100644 (file)
--- a/doc/fixes34.1
+++ b/doc/fixes34.1
@@ -14,6 +14,7 @@ left word in format string in get_wet() causing "The spellbook fadefades"
 two bad wizkit items in a row shouldn't make the user hit space many times
 kicking thrones no longer loosens rocks
 wall symbol not replaced when digging while blind and levitating
+print regular death message when leashed, mounted steed dies of starvation
 
 
 Platform- and/or Interface-Specific Fixes

diff --git a/src/dogmove.c b/src/dogmove.c
index fcfeb6869c55c54e5958789834503423567437a4..0a78bb03a8006e33f141639cd72200173a9f6502 100644 (file)
--- a/src/dogmove.c
+++ b/src/dogmove.c
@@ -248,7 +248,11 @@ register struct edog *edog;
                stop_occupation();
            } else if (monstermoves > edog->hungrytime + 750 || mtmp->mhp < 1) {
            dog_died:
-               if (mtmp->mleashed)
+               if (mtmp->mleashed
+#ifdef STEED
+                   && mtmp != u.usteed
+#endif
+                   )
                    Your("leash goes slack.");
                else if (cansee(mtmp->mx, mtmp->my))
                    pline("%s dies%s.", Monnam(mtmp),