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

@@ -354,11 +354,7 @@ register struct edog *edog;
stop_occupation();
} else if (monstermoves > edog->hungrytime + 750 || mtmp->mhp < 1) {
dog_died:
if (mtmp->mleashed
#ifdef STEED
&& mtmp != u.usteed
#endif
)
if (mtmp->mleashed && mtmp != u.usteed)
Your("leash goes slack.");
else if (cansee(mtmp->mx, mtmp->my))
pline("%s starves.", Monnam(mtmp));
@@ -453,11 +449,9 @@ int after, udist, whappr;
xchar otyp;
int appr;
#ifdef STEED
/* Steeds don't move on their own will */
if (mtmp == u.usteed)
return (-2);
#endif
omx = mtmp->mx;
omy = mtmp->my;
@@ -626,7 +620,6 @@ register int after; /* this is extra fast monster movement */
if (has_edog && dog_hunger(mtmp, edog)) return(2); /* starved */
udist = distu(omx,omy);
#ifdef STEED
/* Let steeds eat and maybe throw rider during Conflict */
if (mtmp == u.usteed) {
if (Conflict && !resist(mtmp, RING_CLASS, 0, 0)) {
@@ -634,10 +627,9 @@ register int after; /* this is extra fast monster movement */
return (1);
}
udist = 1;
} else
#endif
/* maybe we tamed him while being swallowed --jgm */
if (!udist) return(0);
} else if (!udist)
/* maybe we tamed him while being swallowed --jgm */
return(0);
nix = omx; /* set before newdogpos */
niy = omy;