nethack-gwaa-kiwi/nethack
1
0
Fork 0
Code Pull Requests Activity

fix #H8310 - riding a saddled tripe ration

Browse Source 
If steed ate a mimic corpse and started mimicking an object or dungeon
furniture, the hero was able to keep riding.  Force a dismount when
that happens, even if steed takes on monster shape rather than object
or furniture.  After that, #ride to remount non-monster will fail
unless using wizard mode's "force mount to succeed" action, in which
case steed's eating finishes immediately and it returns to normal.

This doesn't address the older report that mounted hero can continue
to move around while the steed is eating.
This commit is contained in:
PatR
2019-03-01 18:32:41 -08:00
parent 23ea5b07fe
commit b211c1b832
2 changed files with 13 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/dogmove.c
View File

@@ -1,4 +1,4 @@
/* NetHack 3.6 dogmove.c $NHDT-Date: 1502753407 2017/08/14 23:30:07 $ $NHDT-Branch: NetHack-3.6.0 $:$NHDT-Revision: 1.63 $ */
/* NetHack 3.6 dogmove.c $NHDT-Date: 1551493951 2019/03/02 02:32:31 $ $NHDT-Branch: NetHack-3.6.2-beta01 $:$NHDT-Revision: 1.72 $ */
/* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */
/*-Copyright (c) Robert Patrick Rankin, 2012. */
/* NetHack may be freely redistributed. See license for details. */
@@ -1379,6 +1379,15 @@ struct monst *mtmp;
if (Protection_from_shape_changers || !mtmp->meating)
return;
/* with polymorph, the steed's equipment would be re-checked and its
saddle would come off, triggering DISMOUNT_FELL, but mimicking
doesn't impact monster's equipment; normally DISMOUNT_POLY is for
rider taking on an unsuitable shape, but its message works fine
for this and also avoids inflicting damage during forced dismount;
do this before changing so that dismount refers to original shape */
if (mtmp == u.usteed)
dismount_steed(DISMOUNT_POLY);
do {
idx = rn2(SIZE(qm));
if (qm[idx].mndx != 0 && monsndx(mtmp->data) == qm[idx].mndx)