Make STEED unconditional.
This commit is contained in:
10
src/mhitm.c
10
src/mhitm.c
@@ -405,12 +405,10 @@ mattackm(magr, mdef)
|
||||
break;
|
||||
|
||||
case AT_ENGL:
|
||||
#ifdef STEED
|
||||
if (u.usteed && (mdef == u.usteed)) {
|
||||
strike = 0;
|
||||
break;
|
||||
}
|
||||
#endif
|
||||
/* Engulfing attacks are directed at the hero if
|
||||
* possible. -dlc
|
||||
*/
|
||||
@@ -956,11 +954,7 @@ mdamagem(magr, mdef, mattk)
|
||||
if (vis) Strcpy(mdef_Monnam, Monnam(mdef));
|
||||
mdef->mstrategy &= ~STRAT_WAITFORU;
|
||||
(void) rloc(mdef, FALSE);
|
||||
if (vis && !canspotmon(mdef)
|
||||
#ifdef STEED
|
||||
&& mdef != u.usteed
|
||||
#endif
|
||||
)
|
||||
if (vis && !canspotmon(mdef) && mdef != u.usteed)
|
||||
pline("%s suddenly disappears!", mdef_Monnam);
|
||||
}
|
||||
break;
|
||||
@@ -1117,12 +1111,10 @@ mdamagem(magr, mdef, mattk)
|
||||
Strcpy(mdefnambuf, x_monnam(mdef, ARTICLE_THE, (char *)0, 0, FALSE));
|
||||
|
||||
otmp = obj;
|
||||
#ifdef STEED
|
||||
if (u.usteed == mdef &&
|
||||
otmp == which_armor(mdef, W_SADDLE))
|
||||
/* "You can no longer ride <steed>." */
|
||||
dismount_steed(DISMOUNT_POLY);
|
||||
#endif
|
||||
obj_extract_self(otmp);
|
||||
if (otmp->owornmask) {
|
||||
mdef->misc_worn_check &= ~otmp->owornmask;
|
||||
|
||||
Reference in New Issue
Block a user