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/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/attack.h')
| -rw-r--r-- | crawl-ref/source/attack.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/crawl-ref/source/attack.h b/crawl-ref/source/attack.h index 6f265c0cc2..7dac3b4d09 100644 --- a/crawl-ref/source/attack.h +++ b/crawl-ref/source/attack.h @@ -84,7 +84,7 @@ public: // Public Methods public: - attack(actor *attk, actor *defn); + attack(actor *attk, actor *defn, bool allow_unarmed); // To-hit is a function of attacker/defender, defined in sub-classes virtual int calc_to_hit(bool) = 0; |