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/mon-util.cc | |
| 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/mon-util.cc')
| -rw-r--r-- | crawl-ref/source/mon-util.cc | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/crawl-ref/source/mon-util.cc b/crawl-ref/source/mon-util.cc index 0ebf93b5ec..a489db046a 100644 --- a/crawl-ref/source/mon-util.cc +++ b/crawl-ref/source/mon-util.cc @@ -3146,18 +3146,18 @@ bool mons_is_batty(const monster* m) bool mons_looks_stabbable(const monster* m) { - const unchivalric_attack_type uat = is_unchivalric_attack(&you, m); + const stab_type st = find_stab_type(&you, m); return !m->friendly() - && (uat == UCAT_PARALYSED || uat == UCAT_SLEEPING); + && (st == STAB_PARALYSED || st == STAB_SLEEPING); } bool mons_looks_distracted(const monster* m) { - const unchivalric_attack_type uat = is_unchivalric_attack(&you, m); + const stab_type st = find_stab_type(&you, m); return !m->friendly() - && uat != UCAT_NO_ATTACK - && uat != UCAT_PARALYSED - && uat != UCAT_SLEEPING; + && st != STAB_NO_STAB + && st != STAB_PARALYSED + && st != STAB_SLEEPING; } void mons_start_fleeing_from_sanctuary(monster* mons) |