summaryrefslogtreecommitdiffstats
path: root/crawl-ref/source/fight.cc
diff options
context:
space:
mode:
Diffstat (limited to 'crawl-ref/source/fight.cc')
-rw-r--r--crawl-ref/source/fight.cc3
1 files changed, 3 insertions, 0 deletions
diff --git a/crawl-ref/source/fight.cc b/crawl-ref/source/fight.cc
index 8eca25a856..1d50aecdcd 100644
--- a/crawl-ref/source/fight.cc
+++ b/crawl-ref/source/fight.cc
@@ -336,6 +336,9 @@ void melee_attack::init_attack()
attacker_visible = attacker->visible();
defender_visible = defender && defender->visible();
needs_message = attacker_visible || defender_visible;
+
+ if (defender && defender->submerged())
+ unarmed_ok = false;
}
std::string melee_attack::actor_name(const actor *a,