Make STEED unconditional.

This commit is contained in:
Sean Hunt
2015-02-13 21:23:56 -05:00
committed by Pasi Kallinen
parent aba6ecb7b3
commit 9759f5bf6d
62 changed files with 98 additions and 641 deletions

View File

@@ -207,12 +207,10 @@ in_trouble()
Cursed_obj(uarmf, FUMBLE_BOOTS))
return TROUBLE_FUMBLING;
if (worst_cursed_item()) return TROUBLE_CURSED_ITEMS;
#ifdef STEED
if (u.usteed) { /* can't voluntarily dismount from a cursed saddle */
otmp = which_armor(u.usteed, W_SADDLE);
if (Cursed_obj(otmp, SADDLE)) return TROUBLE_SADDLE;
}
#endif
if (Blinded > 1 && haseyes(youmonst.data) &&
(!u.uswallow ||
@@ -220,11 +218,7 @@ in_trouble()
return(TROUBLE_BLIND);
for(i=0; i<A_MAX; i++)
if(ABASE(i) < AMAX(i)) return(TROUBLE_POISONED);
if(Wounded_legs
#ifdef STEED
&& !u.usteed
#endif
) return (TROUBLE_WOUNDED_LEGS);
if(Wounded_legs && !u.usteed) return (TROUBLE_WOUNDED_LEGS);
if (u.uhs >= HUNGRY) return TROUBLE_HUNGRY;
if (HStun & TIMEOUT) return TROUBLE_STUNNED;
if (HConfusion & TIMEOUT) return TROUBLE_CONFUSED;
@@ -483,7 +477,6 @@ decurse:
pline ("Looks like you are back in Kansas.");
(void) make_hallucinated(0L,FALSE,0L);
break;
#ifdef STEED
case TROUBLE_SADDLE:
otmp = which_armor(u.usteed, W_SADDLE);
if (!Blind) {
@@ -493,7 +486,6 @@ decurse:
}
uncurse(otmp);
break;
#endif
}
}