From 6a8cc750190313fc4bdca7c1f257708f3298d20f Mon Sep 17 00:00:00 2001 From: David Lawrence Ramsey Date: Mon, 28 Sep 2009 21:46:04 -0500 Subject: Simplify checks for whether players/monsters can hit monsters, and make sure that the latter can properly hit monsters submerged in shallow water if they have tentacles. --- crawl-ref/source/player.cc | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) (limited to 'crawl-ref/source/player.cc') diff --git a/crawl-ref/source/player.cc b/crawl-ref/source/player.cc index a362419d2a..13161c94c7 100644 --- a/crawl-ref/source/player.cc +++ b/crawl-ref/source/player.cc @@ -1093,13 +1093,11 @@ bool player_can_hit_monster(const monsters *mon) if (!mons_is_submerged(mon)) return (true); - if (grd(mon->pos()) == DNGN_SHALLOW_WATER) - { - const item_def *weapon = you.weapon(); - return (weapon && weapon_skill(*weapon) == SK_POLEARMS); - } + if (grd(mon->pos()) != DNGN_SHALLOW_WATER) + return (false); - return (false); + const item_def *weapon = you.weapon(); + return (weapon && weapon_skill(*weapon) == SK_POLEARMS); } int player_teleport(bool calc_unid) -- cgit v1.2.3-54-g00ecf