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/godconduct.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/godconduct.cc')
| -rw-r--r-- | crawl-ref/source/godconduct.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/crawl-ref/source/godconduct.cc b/crawl-ref/source/godconduct.cc index 1e98dabad1..f5dc0b1630 100644 --- a/crawl-ref/source/godconduct.cc +++ b/crawl-ref/source/godconduct.cc @@ -1189,7 +1189,7 @@ void set_attack_conducts(god_conduct_trigger conduct[3], const monster* mon, else if (mon->neutral()) conduct[0].set(DID_ATTACK_NEUTRAL, 5, known, mon); - if (is_unchivalric_attack(&you, mon) + if (find_stab_type(&you, mon) != STAB_NO_STAB && (!_first_attack_conduct[midx] || _first_attack_was_unchivalric[midx])) { |