Fix vault guard impossible

... when the guard is angry, and he's in the vault or in his corridor,
you're not in the vault nor in his corridor, and the level is full
so the guard cannot relocate.
This commit is contained in:
Pasi Kallinen
2019-10-11 20:11:24 +03:00
parent 02b9368dba
commit ab30c3d79d
2 changed files with 4 additions and 2 deletions

View File

@@ -179,6 +179,7 @@ avoid 'object lost' panic when polymorph causes loss of levitation boots or
multiple movement; stop running if/when an engraving is reached
fix exploding land mine moving ball or chain and causing a sanity error
fix firing attached iron ball when swallowed causing a sanity error
fix vault guard impossible when he could not relocate in certain situation
Fixes to Post-3.6.2 Problems that Were Exposed Via git Repository

View File

@@ -775,9 +775,10 @@ register struct monst *grd;
if (!u_in_vault
&& (grd_in_vault || (in_fcorridor(grd, grd->mx, grd->my)
&& !in_fcorridor(grd, u.ux, u.uy)))) {
(void) rloc(grd, FALSE);
(void) rloc(grd, TRUE);
wallify_vault(grd);
(void) clear_fcorr(grd, TRUE);
if (!in_fcorridor(grd, grd->mx, grd->my))
(void) clear_fcorr(grd, TRUE);
goto letknow;
}
if (!in_fcorridor(grd, grd->mx, grd->my))