diff options
| author | elliptic <hyperelliptical@gmail.com> | 2011-11-27 15:54:30 -0500 |
|---|---|---|
| committer | elliptic <hyperelliptical@gmail.com> | 2011-11-27 15:54:30 -0500 |
| commit | 1294cf7a3fdcf5374f47a3eabc17312946f86a3d (patch) | |
| tree | abd651b5c0c2aa104208f4099e573b12340674ff /crawl-ref/source/melee_attack.h | |
| parent | 32a2091cc3b95187a0237ee0adee34b2ee1d13f4 (diff) | |
| download | crawl-ref-1294cf7a3fdcf5374f47a3eabc17312946f86a3d.tar.gz crawl-ref-1294cf7a3fdcf5374f47a3eabc17312946f86a3d.zip | |
Revert "Revert "Clean up aux code a bit.""
This reverts commit b78c00d44495ca2ef685d25537e4078b10598a63.
Next commit fixes the error this commit introduced with many monsters losing
their attacks... oops!
Diffstat (limited to 'crawl-ref/source/melee_attack.h')
| -rw-r--r-- | crawl-ref/source/melee_attack.h | 4 |
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. |