Make STEED unconditional.
This commit is contained in:
@@ -619,13 +619,11 @@ char *enterstring;
|
||||
"Leave the %s%s outside.",
|
||||
tool, plur(cnt));
|
||||
should_block = TRUE;
|
||||
#ifdef STEED
|
||||
} else if (u.usteed) {
|
||||
verbalize(NOTANGRY(shkp) ?
|
||||
"Will you please leave %s outside?" :
|
||||
"Leave %s outside.", y_monnam(u.usteed));
|
||||
should_block = TRUE;
|
||||
#endif
|
||||
verbalize(NOTANGRY(shkp) ?
|
||||
"Will you please leave %s outside?" :
|
||||
"Leave %s outside.", y_monnam(u.usteed));
|
||||
should_block = TRUE;
|
||||
} else {
|
||||
should_block = (Fast && (sobj_at(PICK_AXE, u.ux, u.uy) ||
|
||||
sobj_at(DWARVISH_MATTOCK, u.ux, u.uy)));
|
||||
@@ -3512,11 +3510,7 @@ register struct monst *shkp;
|
||||
avoid = FALSE;
|
||||
} else {
|
||||
#define GDIST(x,y) (dist2(x,y,gx,gy))
|
||||
if (Invis
|
||||
#ifdef STEED
|
||||
|| u.usteed
|
||||
#endif
|
||||
) {
|
||||
if (Invis || u.usteed) {
|
||||
avoid = FALSE;
|
||||
} else {
|
||||
uondoor = (u.ux == eshkp->shd.x && u.uy == eshkp->shd.y);
|
||||
@@ -4285,9 +4279,7 @@ register xchar x, y;
|
||||
&& shkp->mcanmove && !shkp->msleeping
|
||||
&& (x == sx-1 || x == sx+1 || y == sy-1 || y == sy+1)
|
||||
&& (Invis || carrying(PICK_AXE) || carrying(DWARVISH_MATTOCK)
|
||||
#ifdef STEED
|
||||
|| u.usteed
|
||||
#endif
|
||||
)) {
|
||||
pline("%s%s blocks your way!", shkname(shkp),
|
||||
Invis ? " senses your motion and" : "");
|
||||
|
||||
Reference in New Issue
Block a user