[1729180] Fixed message sequence when player scrambles out of deep water into

shallow water.

git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@1505 c06c8d41-db1a-0410-9941-cceddc491573

1 files changed, 10 insertions, 5 deletions

diff --git a/crawl-ref/source/misc.cc b/crawl-ref/source/misc.cc
index fdae822b50..01281e2198 100644
--- a/crawl-ref/source/misc.cc
+++ b/crawl-ref/source/misc.cc
@@ -1603,14 +1603,19 @@ bool fall_into_a_pool( int entry_x, int entry_y, bool allow_shift,
         mpr("You try to escape, but your burden drags you down!");
     }
 
-    if (escape && move_player_to_grid( empty[0], empty[1], false, false, true ))
+    if (escape)
     {
-        mpr("You manage to scramble free!");
+        const coord_def pos(empty[0], empty[1]);
+        if (in_bounds(pos) && !is_grid_dangerous(grd(pos)))
+        {
+            mpr("You manage to scramble free!");
+            move_player_to_grid( empty[0], empty[1], false, false, true );
 
-        if (terrain == DNGN_LAVA)
-            expose_player_to_element( BEAM_LAVA, 14 );
+            if (terrain == DNGN_LAVA)
+                expose_player_to_element( BEAM_LAVA, 14 );
 
-        return (true);
+            return (true);
+        }
     }
 
     mpr("You drown...");