Prevent a possible impossible when guard relocated a monster

diff --git a/doc/fixes36.3 b/doc/fixes36.3
index f5135011760b4b2d628a82bf7f0e2cb3b3acb43c..d0f1fcb89d23da679be6a11b28cf73315d9ff37d 100644 (file)
--- a/doc/fixes36.3
+++ b/doc/fixes36.3
@@ -136,6 +136,7 @@ have 'O' update persistent inventory window if 'implicit_uncursed',
 when spellcasting monster aimed at wrong spot due to not being able to see
        invisible hero, feedback could be erroneous if hero could see self
        [messages used 'if (Invisible)' test where 'if (Invis)' was meant]
+prevent impossible when guard tries to relocate a monster on a full level
 
 
 Fixes to Post-3.6.2 Problems that Were Exposed Via git Repository

diff --git a/src/vault.c b/src/vault.c
index 7340ba2a4eaa081f3f0c65d746fb3208cd3ec389..6ff80fa76fd1baff2556e80bded887134532a148 100644 (file)
--- a/src/vault.c
+++ b/src/vault.c
@@ -79,7 +79,8 @@ boolean forceshow;
             } else if (!in_fcorridor(grd, u.ux, u.uy)) {
                 if (mtmp->mtame)
                     yelp(mtmp);
-                (void) rloc(mtmp, FALSE);
+                if (!rloc(mtmp, TRUE))
+                    m_into_limbo(mtmp);
             }
         }
         lev = &levl[fcx][fcy];