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

losing saddle while riding

Browse Source 
Noticed while looking at something else:  zapping a wand of opening
or spell of knock downwards while riding causes your steed's saddle to
fall off, which in turn causes the hero to fall and take some damage.
If that damage was fatal, the saddle would be left worn in bones data.
This reorganizes mdrop_obj() to defer until last the part that ultimately
makes the hero fall off, and changes bhitm() to call that instead of
handling saddle removal inline, also gives new saddle-off feedback there.
This commit is contained in:
nethack.rankin
2007-04-17 03:43:17 +00:00
parent 7a08422884
commit 933c1846b9
4 changed files with 23 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/steal.c
View File

@@ -1,4 +1,4 @@
/* SCCS Id: @(#)steal.c 3.5 2006/06/25 */
/* SCCS Id: @(#)steal.c 3.5 2007/04/16 */
/* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */
/* NetHack may be freely redistributed. See license for details. */
@@ -7,7 +7,6 @@
STATIC_PTR int NDECL(stealarm);
STATIC_DCL const char *FDECL(equipname, (struct obj *));
STATIC_DCL void FDECL(mdrop_obj, (struct monst *,struct obj *,BOOLEAN_P));
STATIC_OVL const char *
equipname(otmp)
@@ -554,19 +553,20 @@ struct monst *mtmp;
}
/* drop one object taken from a (possibly dead) monster's inventory */
STATIC_OVL void
void
mdrop_obj(mon, obj, verbosely)
struct monst *mon;
struct obj *obj;
boolean verbosely;
{
int omx = mon->mx, omy = mon->my;
boolean update_mon = FALSE;
if (obj->owornmask) {
/* perform worn item handling if the monster is still alive */
if (mon->mhp > 0) {
mon->misc_worn_check &= ~obj->owornmask;
update_mon_intrinsics(mon, obj, FALSE, TRUE);
update_mon = TRUE;
#ifdef STEED
/* don't charge for an owned saddle on dead steed */
} else if (mon->mtame && (obj->owornmask & W_SADDLE) &&
@@ -585,6 +585,9 @@ boolean verbosely;
place_object(obj, omx, omy);
stackobj(obj);
}
/* do this last, after placing obj on floor; removing steed's saddle
throws rider, possibly inflicting fatal damage and producing bones */
if (update_mon) update_mon_intrinsics(mon, obj, FALSE, TRUE);
}
/* some monsters bypass the normal rules for moving between levels or

21
src/zap.c
View File

@@ -299,14 +299,21 @@ struct obj *otmp;
break;
#ifdef STEED
} else if ((obj = which_armor(mtmp, W_SADDLE)) != 0) {
mtmp->misc_worn_check &= ~obj->owornmask;
update_mon_intrinsics(mtmp, obj, FALSE, FALSE);
obj->owornmask = 0L;
char buf[BUFSZ];
Sprintf(buf, "%s %s", s_suffix(Monnam(mtmp)),
distant_name(obj, xname));
if (cansee(mtmp->mx, mtmp->my)) {
if (!canspotmon(mtmp))
Strcpy(buf, An(distant_name(obj, xname)));
pline("%s falls to the %s.",
buf, surface(mtmp->mx, mtmp->my));
} else if (canspotmon(mtmp)) {
pline("%s falls off.", buf);
}
obj_extract_self(obj);
place_object(obj, mtmp->mx, mtmp->my);
/* call stackobj() if we ever drop anything that can merge */
newsym(mtmp->mx, mtmp->my);
#endif
mdrop_obj(mtmp, obj, FALSE);
#endif /* STEED */
}
break;
case SPE_HEALING: