summaryrefslogtreecommitdiffstats
path: root/crawl-ref/source/melee_attack.h
diff options
context:
space:
mode:
authorelliptic <hyperelliptical@gmail.com>2011-11-26 20:48:18 -0500
committerelliptic <hyperelliptical@gmail.com>2011-11-26 20:53:11 -0500
commit4cde183eca711078bdf6e2d9a0ec6ff6275875d5 (patch)
tree67228f868833c0d6e98806e3af2bca555b07478c /crawl-ref/source/melee_attack.h
parente16992fe3cd2c6fa2cd2a6b3c8055d16be858de5 (diff)
downloadcrawl-ref-4cde183eca711078bdf6e2d9a0ec6ff6275875d5.tar.gz
crawl-ref-4cde183eca711078bdf6e2d9a0ec6ff6275875d5.zip
Clean up aux code a bit.
Passing allow_unarmed around everywhere wasn't actually doing anything, and can_do_unarmed was misleading.
Diffstat (limited to 'crawl-ref/source/melee_attack.h')
-rw-r--r--crawl-ref/source/melee_attack.h4
1 files changed, 1 insertions, 3 deletions
diff --git a/crawl-ref/source/melee_attack.h b/crawl-ref/source/melee_attack.h
index 88600a1013..015b45d054 100644
--- a/crawl-ref/source/melee_attack.h
+++ b/crawl-ref/source/melee_attack.h
@@ -39,8 +39,6 @@ public:
beam_type special_damage_flavour;
- bool can_do_unarmed;
-
bool stab_attempt;
int stab_bonus;
@@ -51,7 +49,7 @@ public:
actor* miscast_target;
public:
- melee_attack(actor *attacker, actor *defender, bool allow_unarmed = true,
+ melee_attack(actor *attacker, actor *defender,
int attack_num = -1, int effective_attack_num = -1);
// Applies attack damage and other effects.