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

Unify putting a saddle on steed

Browse Source
This commit is contained in:
Pasi Kallinen
2016-02-05 17:23:22 +02:00
parent 00935a11c8
commit 0ca477486d
4 changed files with 19 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
src/steed.c
View File

@@ -134,18 +134,27 @@ struct obj *otmp;
if (otmp->owornmask)
remove_worn_item(otmp, FALSE);
freeinv(otmp);
/* mpickobj may free otmp it if merges, but we have already
checked for a saddle above, so no merger should happen */
(void) mpickobj(mtmp, otmp);
mtmp->misc_worn_check |= W_SADDLE;
otmp->owornmask = W_SADDLE;
otmp->leashmon = mtmp->m_id;
update_mon_intrinsics(mtmp, otmp, TRUE, FALSE);
put_saddle_on_mon(otmp, mtmp);
} else
pline("%s resists!", Monnam(mtmp));
return 1;
}
void
put_saddle_on_mon(saddle, mtmp)
struct obj *saddle;
struct monst *mtmp;
{
if (!can_saddle(mtmp) || which_armor(mtmp, W_SADDLE))
return;
if (mpickobj(mtmp, saddle))
panic("merged saddle?");
mtmp->misc_worn_check |= W_SADDLE;
saddle->owornmask = W_SADDLE;
saddle->leashmon = mtmp->m_id;
update_mon_intrinsics(mtmp, saddle, TRUE, FALSE);
}
/*** Riding the monster ***/
/* Can we ride this monster? Caller should also check can_saddle() */