summaryrefslogtreecommitdiffstats
path: root/crawl-ref/source/fight.h
diff options
context:
space:
mode:
authorelliptic <hyperelliptical@gmail.com>2011-11-27 15:54:30 -0500
committerelliptic <hyperelliptical@gmail.com>2011-11-27 15:54:30 -0500
commit1294cf7a3fdcf5374f47a3eabc17312946f86a3d (patch)
treeabd651b5c0c2aa104208f4099e573b12340674ff /crawl-ref/source/fight.h
parent32a2091cc3b95187a0237ee0adee34b2ee1d13f4 (diff)
downloadcrawl-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/fight.h')
-rw-r--r--crawl-ref/source/fight.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/crawl-ref/source/fight.h b/crawl-ref/source/fight.h
index 9ba2a329a7..501e8e4bac 100644
--- a/crawl-ref/source/fight.h
+++ b/crawl-ref/source/fight.h
@@ -25,7 +25,7 @@ enum unchivalric_attack_type
UCAT_ALLY,
};
-bool fight_melee(actor *attacker, actor *defender, bool allow_unarmed = true);
+bool fight_melee(actor *attacker, actor *defender);
int effective_stat_bonus(int wepType = -1);