summaryrefslogtreecommitdiffstats
path: root/crawl-ref/source/fight.cc
diff options
context:
space:
mode:
authordolorous <dolorous@c06c8d41-db1a-0410-9941-cceddc491573>2008-06-17 08:16:46 +0000
committerdolorous <dolorous@c06c8d41-db1a-0410-9941-cceddc491573>2008-06-17 08:16:46 +0000
commit4124beeb671a7ec47344a05153d469afbc69a43a (patch)
tree0518f7df8f52fd3534ca700230dbfcd90e45210b /crawl-ref/source/fight.cc
parentaab5319a5fa4c685f00722c69a3357c64b37ac85 (diff)
downloadcrawl-ref-4124beeb671a7ec47344a05153d469afbc69a43a.tar.gz
crawl-ref-4124beeb671a7ec47344a05153d469afbc69a43a.zip
Simplify.
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@5918 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 8ca5e7f113..5e980de450 100644
--- a/crawl-ref/source/fight.cc
+++ b/crawl-ref/source/fight.cc
@@ -608,7 +608,7 @@ bool melee_attack::attack()
check_autoberserk();
check_special_wield_effects();
- god_conduct_trigger conducts[4];
+ god_conduct_trigger conducts[3];
disable_attack_conducts(conducts);
if (attacker->atype() == ACT_PLAYER)