Make STEED unconditional.
This commit is contained in:
12
src/mhitu.c
12
src/mhitu.c
@@ -323,7 +323,6 @@ mattacku(mtmp)
|
||||
if(u.uinvulnerable) return (0); /* stomachs can't hurt you! */
|
||||
}
|
||||
|
||||
#ifdef STEED
|
||||
else if (u.usteed) {
|
||||
if (mtmp == u.usteed)
|
||||
/* Your steed won't attack you */
|
||||
@@ -343,7 +342,6 @@ mattacku(mtmp)
|
||||
return (!!(mattackm(u.usteed, mtmp) & MM_DEF_DIED));
|
||||
}
|
||||
}
|
||||
#endif
|
||||
|
||||
if (u.uundetected && !range2 && foundyou && !u.uswallow) {
|
||||
if (!canspotmon(mtmp)) map_invisible(mtmp->mx, mtmp->my);
|
||||
@@ -1145,11 +1143,7 @@ dopois:
|
||||
* still _can_ attack you when you're flying or mounted.
|
||||
* [FIXME: why can't a flying attacker overcome this?]
|
||||
*/
|
||||
if (
|
||||
#ifdef STEED
|
||||
u.usteed ||
|
||||
#endif
|
||||
Levitation || Flying) {
|
||||
if (u.usteed || Levitation || Flying) {
|
||||
pline("%s tries to reach your %s %s!", Monnam(mtmp),
|
||||
sidestr, body_part(LEG));
|
||||
dmg = 0;
|
||||
@@ -1664,7 +1658,6 @@ gulpmu(mtmp, mattk) /* monster swallows you, or damage if u.uswallow */
|
||||
place_monster(mtmp, u.ux, u.uy);
|
||||
u.ustuck = mtmp;
|
||||
newsym(mtmp->mx,mtmp->my);
|
||||
#ifdef STEED
|
||||
if (is_animal(mtmp->data) && u.usteed) {
|
||||
char buf[BUFSZ];
|
||||
/* Too many quirks presently if hero and steed
|
||||
@@ -1676,8 +1669,7 @@ gulpmu(mtmp, mattk) /* monster swallows you, or damage if u.uswallow */
|
||||
Monnam(mtmp), buf);
|
||||
dismount_steed(DISMOUNT_ENGULFED);
|
||||
} else
|
||||
#endif
|
||||
pline("%s engulfs you!", Monnam(mtmp));
|
||||
pline("%s engulfs you!", Monnam(mtmp));
|
||||
stop_occupation();
|
||||
reset_occupations(); /* behave as if you had moved */
|
||||
|
||||
|
||||
Reference in New Issue
Block a user