diff options
| author | Robert Burnham <burnhamrobertp@gmail.com> | 2011-11-27 12:37:50 -0600 |
|---|---|---|
| committer | Robert Burnham <burnhamrobertp@gmail.com> | 2011-11-27 12:37:50 -0600 |
| commit | b78c00d44495ca2ef685d25537e4078b10598a63 (patch) | |
| tree | 669f2cbaa491590354a62862ff5c9087eef9e26f /crawl-ref/source/melee_attack.h | |
| parent | 1c397bb3a58fce566a90e5b7167e0520e032cc15 (diff) | |
| download | crawl-ref-b78c00d44495ca2ef685d25537e4078b10598a63.tar.gz crawl-ref-b78c00d44495ca2ef685d25537e4078b10598a63.zip | |
Revert "Clean up aux code a bit."
This reverts commit 4cde183eca711078bdf6e2d9a0ec6ff6275875d5.
This commit breaks hydra, black mamba, and who knows how many other
forms of combat. I'll review the content (most of which is probably
desirable) and once I figure out what was breaking the combat for
these monsters, I'll re-implement and push everything else in this
commit back.
Diffstat (limited to 'crawl-ref/source/melee_attack.h')
| -rw-r--r-- | crawl-ref/source/melee_attack.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/crawl-ref/source/melee_attack.h b/crawl-ref/source/melee_attack.h index 015b45d054..88600a1013 100644 --- a/crawl-ref/source/melee_attack.h +++ b/crawl-ref/source/melee_attack.h @@ -39,6 +39,8 @@ public: beam_type special_damage_flavour; + bool can_do_unarmed; + bool stab_attempt; int stab_bonus; @@ -49,7 +51,7 @@ public: actor* miscast_target; public: - melee_attack(actor *attacker, actor *defender, + melee_attack(actor *attacker, actor *defender, bool allow_unarmed = true, int attack_num = -1, int effective_attack_num = -1); // Applies attack damage and other effects. |