summaryrefslogtreecommitdiffstats
path: root/crawl-ref/source/mon-util.cc
diff options
context:
space:
mode:
Diffstat (limited to 'crawl-ref/source/mon-util.cc')
-rw-r--r--crawl-ref/source/mon-util.cc12
1 files changed, 12 insertions, 0 deletions
diff --git a/crawl-ref/source/mon-util.cc b/crawl-ref/source/mon-util.cc
index 6ebf1349fc..6f9be5609f 100644
--- a/crawl-ref/source/mon-util.cc
+++ b/crawl-ref/source/mon-util.cc
@@ -3587,6 +3587,18 @@ bool monsters::is_habitable_feat(dungeon_feature_type actual_grid) const
bool monsters::can_drown() const
{
+ // Presumeably a shark in lava or a lavafish in deep water could
+ // drown, but that should never happen, so this simple check should
+ // be enough.
+ switch (mons_primary_habitat(this))
+ {
+ case HT_WATER:
+ case HT_LAVA:
+ return (false);
+ default:
+ break;
+ }
+
// Mummies can fall apart in water or be incinerated in lava.
// Ghouls, vampires, and demons can drown in water or lava. Others
// just "sink like a rock", to never be seen again.