diff options
| author | Adam Borowski <kilobyte@angband.pl> | 2011-12-22 01:00:54 +0100 |
|---|---|---|
| committer | Adam Borowski <kilobyte@angband.pl> | 2011-12-22 01:00:54 +0100 |
| commit | 53de47d6470cb6b1ec75f30190e9af11bae0872d (patch) | |
| tree | cbb289c72e5a25dab4fc89e40c85ffd28707bef3 /crawl-ref/source/melee_attack.h | |
| parent | 90b5e0f82c24d5493a490ebc6a9fbb2076bb163c (diff) | |
| parent | 570a689e703203281f9f6844be6d49ab269ae164 (diff) | |
| download | crawl-ref-53de47d6470cb6b1ec75f30190e9af11bae0872d.tar.gz crawl-ref-53de47d6470cb6b1ec75f30190e9af11bae0872d.zip | |
Merge branch 'constriction'
Diffstat (limited to 'crawl-ref/source/melee_attack.h')
| -rw-r--r-- | crawl-ref/source/melee_attack.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/crawl-ref/source/melee_attack.h b/crawl-ref/source/melee_attack.h index 2cdd71e58c..688b048e61 100644 --- a/crawl-ref/source/melee_attack.h +++ b/crawl-ref/source/melee_attack.h @@ -15,6 +15,7 @@ struct mon_attack_def; enum unarmed_attack_type { UNAT_NO_ATTACK, // 0 + UNAT_CONSTRICT, // put constriction first so octopodes will use it UNAT_KICK, UNAT_HEADBUTT, UNAT_TAILSLAP, @@ -22,7 +23,7 @@ enum unarmed_attack_type UNAT_BITE, UNAT_PSEUDOPODS, UNAT_TENTACLES, - UNAT_FIRST_ATTACK = UNAT_KICK, + UNAT_FIRST_ATTACK = UNAT_CONSTRICT, UNAT_LAST_ATTACK = UNAT_TENTACLES }; @@ -180,6 +181,8 @@ private: bool needs_bite_msg = false, int reduction = 1); bool _vamp_wants_blood_from_monster(const monster* mon); + void handle_player_constriction(); + bool handle_monster_constriction(); }; #endif |