From 12de33d2d95164e30a8a2ac960ad28b2a69383e3 Mon Sep 17 00:00:00 2001 From: j-p-e-g Date: Thu, 17 Apr 2008 21:28:56 +0000 Subject: Another modification of autotargetting submerged monsters, based off BR 1935715. * Targeting a square with a known submerged monster ("strange disturbance" description) always enforces '!' rather than '.' * Submerged monsters only get targetted if there are no other more viable targets (dangerous monsters, really) in sight. The latter uses a heavily modified i_feel_safe() that now draws on get_playervisible_monsters(), which got numerous new parameters to cover all possibilities. :p git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@4314 c06c8d41-db1a-0410-9941-cceddc491573 --- crawl-ref/source/fight.cc | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'crawl-ref/source/fight.cc') diff --git a/crawl-ref/source/fight.cc b/crawl-ref/source/fight.cc index 80e10471de..ddbaad4aa2 100644 --- a/crawl-ref/source/fight.cc +++ b/crawl-ref/source/fight.cc @@ -348,13 +348,13 @@ void melee_attack::init_attack() if (defender) defender_shield = defender->shield(); - water_attack = is_water_attack(attacker, defender); - attacker_visible = attacker->visible(); + water_attack = is_water_attack(attacker, defender); + attacker_visible = attacker->visible(); attacker_invisible = !attacker_visible && see_grid(attacker->pos()); - defender_visible = defender && defender->visible(); + defender_visible = defender && defender->visible(); defender_invisible = !defender_visible && defender - && see_grid(defender->pos()); - needs_message = attacker_visible || defender_visible; + && see_grid(defender->pos()); + needs_message = attacker_visible || defender_visible; if (defender && defender->submerged()) unarmed_ok = false; -- cgit v1.2.3-54-g00ecf