diff options
| author | haranp <haranp@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-10-03 20:00:42 +0000 |
|---|---|---|
| committer | haranp <haranp@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-10-03 20:00:42 +0000 |
| commit | c07f2c46323c57f9d5699293e3e4458d5bbacde5 (patch) | |
| tree | 4afb8218230bd780be1d925a84f4abe8542aef32 /crawl-ref/source/fight.cc | |
| parent | 774610f0402dc15c10a1a39105e2427484364006 (diff) | |
| download | crawl-ref-c07f2c46323c57f9d5699293e3e4458d5bbacde5.tar.gz crawl-ref-c07f2c46323c57f9d5699293e3e4458d5bbacde5.zip | |
Some cleanup (replacing you.duration[DUR_CONF] with you.confused())
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@7108 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/fight.cc')
| -rw-r--r-- | crawl-ref/source/fight.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/crawl-ref/source/fight.cc b/crawl-ref/source/fight.cc index 47ce1aac54..8e1d8623bc 100644 --- a/crawl-ref/source/fight.cc +++ b/crawl-ref/source/fight.cc @@ -4089,7 +4089,7 @@ int melee_attack::mons_to_hit() static bool wielded_weapon_check(const item_def *weapon) { bool result = true; - if (!you.received_weapon_warning && !you.duration[DUR_CONF] + if (!you.received_weapon_warning && !you.confused() && (weapon && weapon->base_type != OBJ_STAVES && (weapon->base_type != OBJ_WEAPONS || is_range_weapon(*weapon)) || you.attribute[ATTR_WEAPON_SWAP_INTERRUPTED])) |