Make STEED unconditional.
This commit is contained in:
@@ -169,10 +169,8 @@ struct obj *obj;
|
||||
res = W_TOOL; /* WORN_BLINDF */
|
||||
else if (is_weptool(obj) || otyp == TIN_OPENER)
|
||||
res = W_WEP|W_SWAPWEP;
|
||||
#ifdef STEED
|
||||
else if (otyp == SADDLE)
|
||||
res = W_SADDLE;
|
||||
#endif
|
||||
break;
|
||||
case FOOD_CLASS:
|
||||
if (obj->otyp == MEAT_RING) res = W_RINGL|W_RINGR;
|
||||
@@ -382,10 +380,8 @@ boolean on, silently;
|
||||
break;
|
||||
}
|
||||
|
||||
#ifdef STEED
|
||||
if (!on && mon == u.usteed && obj->otyp == SADDLE)
|
||||
dismount_steed(DISMOUNT_FELL);
|
||||
#endif
|
||||
|
||||
/* if couldn't see it but now can, or vice versa, update display */
|
||||
if (!silently && (unseen ^ !canseemon(mon)))
|
||||
@@ -837,7 +833,6 @@ boolean polyspot;
|
||||
m_lose_armor(mon, otmp);
|
||||
}
|
||||
}
|
||||
#ifdef STEED
|
||||
if (!can_saddle(mon)) {
|
||||
if ((otmp = which_armor(mon, W_SADDLE)) != 0) {
|
||||
if (polyspot) bypass_obj(otmp);
|
||||
@@ -861,7 +856,6 @@ boolean polyspot;
|
||||
}
|
||||
dismount_steed(DISMOUNT_FELL);
|
||||
}
|
||||
#endif
|
||||
return;
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user