diff options
| author | Neil Moore <neil@s-z.org> | 2011-12-27 15:59:42 -0500 |
|---|---|---|
| committer | Neil Moore <neil@s-z.org> | 2011-12-27 15:59:42 -0500 |
| commit | 5ac1dfcd60e1276eaaaecdc1ae1aac3e07cde499 (patch) | |
| tree | 00f69c4d3abbc220c3e31955e02bd4afc6159188 /crawl-ref/source/melee_attack.h | |
| parent | 381e6db9b36a87a61f6e264bfe6bf737ada7df98 (diff) | |
| download | crawl-ref-5ac1dfcd60e1276eaaaecdc1ae1aac3e07cde499.tar.gz crawl-ref-5ac1dfcd60e1276eaaaecdc1ae1aac3e07cde499.zip | |
Merge player/monster noattack constriction code.
Also, properly attribute constriction kills by confused monsters;
and fix a warning when compiling without diagnostics.
Diffstat (limited to 'crawl-ref/source/melee_attack.h')
| -rw-r--r-- | crawl-ref/source/melee_attack.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/crawl-ref/source/melee_attack.h b/crawl-ref/source/melee_attack.h index 6bd22b1a49..8b3ad1a3e8 100644 --- a/crawl-ref/source/melee_attack.h +++ b/crawl-ref/source/melee_attack.h @@ -169,7 +169,6 @@ private: std::string player_why_missed(); void player_warn_miss(); void player_weapon_upsets_god(); - void _monster_die(monster* mons, killer_type killer, int killer_index); void _defender_die(); // Output methods |