diff options
| author | Shmuale Mark <shm.mark@gmail.com> | 2014-03-06 15:10:53 -0500 |
|---|---|---|
| committer | Shmuale Mark <shm.mark@gmail.com> | 2014-03-06 15:19:26 -0500 |
| commit | 4f994348c93d311d2beaf58f24822d011c5afefa (patch) | |
| tree | 1d6f994b8f17d77b7c46d7077ac055022bd7b1c9 /crawl-ref/source/fight.h | |
| parent | 64060d9ddb113ae029b828f1aa10c80b673d7ff2 (diff) | |
| download | crawl-ref-4f994348c93d311d2beaf58f24822d011c5afefa.tar.gz crawl-ref-4f994348c93d311d2beaf58f24822d011c5afefa.zip | |
Rename unchivalric_attack_type and friends.
The enum values were never checked in any code relating to chivalry,
except to see that a value wasn't 0 (ie it was a forbidden stab).
A recent bug arose from the bad naming, too.
Diffstat (limited to 'crawl-ref/source/fight.h')
| -rw-r--r-- | crawl-ref/source/fight.h | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/crawl-ref/source/fight.h b/crawl-ref/source/fight.h index 03a4f68bdd..64aece1621 100644 --- a/crawl-ref/source/fight.h +++ b/crawl-ref/source/fight.h @@ -10,20 +10,20 @@ #include "random-var.h" -enum unchivalric_attack_type +enum stab_type { - UCAT_NO_ATTACK, // 0 - UCAT_DISTRACTED, - UCAT_CONFUSED, - UCAT_FLEEING, - UCAT_INVISIBLE, - UCAT_HELD_IN_NET, - UCAT_PETRIFYING, - UCAT_PETRIFIED, - UCAT_PARALYSED, - UCAT_SLEEPING, - UCAT_ALLY, - NUM_UCAT + STAB_NO_STAB, // 0 + STAB_DISTRACTED, + STAB_CONFUSED, + STAB_FLEEING, + STAB_INVISIBLE, + STAB_HELD_IN_NET, + STAB_PETRIFYING, + STAB_PETRIFIED, + STAB_PARALYSED, + STAB_SLEEPING, + STAB_ALLY, + NUM_STAB }; bool fight_melee(actor *attacker, actor *defender, bool *did_hit = NULL, @@ -39,8 +39,8 @@ int resist_adjust_damage(actor *defender, beam_type flavour, bool wielded_weapon_check(item_def *weapon, bool no_message = false); int calc_heavy_armour_penalty(bool random_factor); -unchivalric_attack_type is_unchivalric_attack(const actor *attacker, - const actor *defender); +stab_type find_stab_type(const actor *attacker, + const actor *defender); void chaos_affect_actor(actor *victim); void get_cleave_targets(const actor* attacker, const coord_def& def, int dir, |