Prevent Shoals tide from drowning monsters and player if they cannot be moved out of the way. (syllogism)

1 files changed, 6 insertions, 3 deletions

diff --git a/crawl-ref/source/dgn-shoals.cc b/crawl-ref/source/dgn-shoals.cc
index e9e563cea3..1facae1206 100644
--- a/crawl-ref/source/dgn-shoals.cc
+++ b/crawl-ref/source/dgn-shoals.cc
@@ -938,9 +938,12 @@ static bool _shoals_tide_sweep_actors_clear(coord_def c)
             return true;
     }
     coord_def evacuation_point(_shoals_escape_place_from(c, victim, NULL));
-    // The tide moves on even if we cannot evacuate the tile!
-    if (!evacuation_point.origin())
-        victim->move_to_pos(evacuation_point);
+    // The tide no longer drowns monster/player if it cannot push them
+    // out of the way.
+    if (evacuation_point.origin())
+        return false;
+
+    victim->move_to_pos(evacuation_point);
     return true;
 }