summaryrefslogtreecommitdiffstats
path: root/crawl-ref/source/fight.cc
diff options
context:
space:
mode:
authorj-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573>2008-07-31 16:13:29 +0000
committerj-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573>2008-07-31 16:13:29 +0000
commitc41c9b094a552b13d12d40241dc230ac9083bac2 (patch)
treec45731e24699dfe574823d9effefe5727c9ba293 /crawl-ref/source/fight.cc
parent6bc76233dd44862268b48596d0c8fe5a17eb5a89 (diff)
downloadcrawl-ref-c41c9b094a552b13d12d40241dc230ac9083bac2.tar.gz
crawl-ref-c41c9b094a552b13d12d40241dc230ac9083bac2.zip
Apply the recent commits to branch, update the version and change log to
0.4.3. git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/branches/stone_soup-0.4@6740 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/fight.cc')
-rw-r--r--crawl-ref/source/fight.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/crawl-ref/source/fight.cc b/crawl-ref/source/fight.cc
index e2e10491df..8dfbb0aafe 100644
--- a/crawl-ref/source/fight.cc
+++ b/crawl-ref/source/fight.cc
@@ -4117,7 +4117,7 @@ bool you_attack(int monster_attacked, bool unarmed_attacks)
interrupt_activity(AI_HIT_MONSTER, defender);
// Check if the player is fighting with something unsuitable.
- if (!wielded_weapon_check(attk.weapon))
+ if (you.can_see(defender) && !wielded_weapon_check(attk.weapon))
{
you.turn_is_over = false;
return (false);