summaryrefslogtreecommitdiffstats
path: root/crawl-ref/source/dgn-shoals.cc
diff options
context:
space:
mode:
authorRaphael Langella <raphael.langella@gmail.com>2013-12-26 23:32:52 +0100
committerRaphael Langella <raphael.langella@gmail.com>2013-12-26 23:32:52 +0100
commitfef21cf8959f9dda4194e835ae27c5df0c70d6c1 (patch)
treea951a38d3f3d8d5f3be4f7ba4cbf248a0bafe32a /crawl-ref/source/dgn-shoals.cc
parentf99021430d71506833dcd26ee1ec060ce70eb33a (diff)
downloadcrawl-ref-fef21cf8959f9dda4194e835ae27c5df0c70d6c1.tar.gz
crawl-ref-fef21cf8959f9dda4194e835ae27c5df0c70d6c1.zip
Tide pushes player if their flight (or form) is expiring.
Another insta-drown safety.
Diffstat (limited to 'crawl-ref/source/dgn-shoals.cc')
-rw-r--r--crawl-ref/source/dgn-shoals.cc7
1 files changed, 6 insertions, 1 deletions
diff --git a/crawl-ref/source/dgn-shoals.cc b/crawl-ref/source/dgn-shoals.cc
index 50c3f37b5c..78b3a2d8ef 100644
--- a/crawl-ref/source/dgn-shoals.cc
+++ b/crawl-ref/source/dgn-shoals.cc
@@ -931,8 +931,13 @@ static bool _shoals_tide_sweep_items_clear(coord_def c)
static bool _shoals_tide_sweep_actors_clear(coord_def c)
{
actor *victim = actor_at(c);
- if (!victim || !victim->ground_level() || victim->swimming())
+ if (!victim
+ || (victim->swimming() || !victim->ground_level())
+ && (!victim->is_player()
+ || !need_expiration_warning(DNGN_DEEP_WATER)))
+ {
return true;
+ }
if (victim->is_monster())
{