From ae5abcdab69c7caa0570e98378f864aaf07096d0 Mon Sep 17 00:00:00 2001 From: dshaligram Date: Fri, 1 Jun 2007 12:39:38 +0000 Subject: [1612448] Allow polearm users to attack monster submerged in shallow water. Need to update the AI so the monster either flees or unsubmerges and fights. git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@1501 c06c8d41-db1a-0410-9941-cceddc491573 --- crawl-ref/source/fight.cc | 3 +++ 1 file changed, 3 insertions(+) (limited to 'crawl-ref/source/fight.cc') 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, -- cgit v1.2.3-54-g00ecf