From: Pasi Kallinen <paxed@alt.org>
Date: Fri, 6 Sep 2019 19:09:03 +0000 (+0300)
Subject: Prevent a possible impossible when guard relocated a monster
X-Git-Tag: v3.6.3.757eca7~81
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=6426e61860f984abc548a4369b7987d23a72d60d;p=nethack

Prevent a possible impossible when guard relocated a monster
---

diff --git a/doc/fixes36.3 b/doc/fixes36.3
index f51350117..d0f1fcb89 100644
--- 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 7340ba2a4..6ff80fa76 100644
--- 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];