Make STEED unconditional.
This commit is contained in:
12
src/eat.c
12
src/eat.c
@@ -1017,10 +1017,8 @@ register int pm;
|
||||
u.uconduct.polyselfs++; /* you're changing form */
|
||||
You_cant("resist the temptation to mimic %s.",
|
||||
Hallucination ? "an orange" : "a pile of gold");
|
||||
#ifdef STEED
|
||||
/* A pile of gold can't ride. */
|
||||
if (u.usteed) dismount_steed(DISMOUNT_FELL);
|
||||
#endif
|
||||
nomul(-tmp);
|
||||
Sprintf(buf, Hallucination ?
|
||||
"You suddenly dread being peeled and mimic %s again!" :
|
||||
@@ -1540,9 +1538,7 @@ struct obj *obj;
|
||||
what = "you lose control of", where = "yourself";
|
||||
else
|
||||
what = "you slap against the", where =
|
||||
#ifdef STEED
|
||||
(u.usteed) ? "saddle" :
|
||||
#endif
|
||||
surface(u.ux,u.uy);
|
||||
pline_The("world spins and %s %s.", what, where);
|
||||
incr_itimeout(&HDeaf, duration);
|
||||
@@ -2337,11 +2333,7 @@ doeat() /* generic "eat" command funtion (see cmd.c) */
|
||||
} else if (!is_edible(otmp)) {
|
||||
You("cannot eat that!");
|
||||
return 0;
|
||||
} else if ((otmp->owornmask & (W_ARMOR|W_TOOL|W_AMUL
|
||||
#ifdef STEED
|
||||
|W_SADDLE
|
||||
#endif
|
||||
)) != 0) {
|
||||
} else if ((otmp->owornmask & (W_ARMOR|W_TOOL|W_AMUL|W_SADDLE)) != 0) {
|
||||
/* let them eat rings */
|
||||
You_cant("eat %s you're wearing.", something);
|
||||
return 0;
|
||||
@@ -2844,9 +2836,7 @@ floorfood(verb,corpsecheck) /* get food from floor or pack */
|
||||
|
||||
/* if we can't touch floor objects then use invent food only */
|
||||
if (!can_reach_floor(TRUE) ||
|
||||
#ifdef STEED
|
||||
(feeding && u.usteed) || /* can't eat off floor while riding */
|
||||
#endif
|
||||
(is_pool_or_lava(u.ux, u.uy) &&
|
||||
(Wwalking || is_clinger(youmonst.data) ||
|
||||
(Flying && !Breathless))))
|
||||
|
||||
Reference in New Issue
Block a user