diff options
| author | David Lawrence Ramsey <dolorous@users.sourceforge.net> | 2009-11-20 00:28:53 -0600 |
|---|---|---|
| committer | David Lawrence Ramsey <dolorous@users.sourceforge.net> | 2009-11-20 00:28:53 -0600 |
| commit | 38cee7a5098ed1c6e6920df98370128a28df8e06 (patch) | |
| tree | e8732cdab90ee80ff0cbddfd688c4640a8149654 /crawl-ref/source/attitude-change.cc | |
| parent | 64eb612845fa71e3e53ae16f26d6a5be2223f172 (diff) | |
| download | crawl-ref-38cee7a5098ed1c6e6920df98370128a28df8e06.tar.gz crawl-ref-38cee7a5098ed1c6e6920df98370128a28df8e06.zip | |
Fix the last missing instances of the unclean/chaotic split.
Diffstat (limited to 'crawl-ref/source/attitude-change.cc')
| -rw-r--r-- | crawl-ref/source/attitude-change.cc | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/crawl-ref/source/attitude-change.cc b/crawl-ref/source/attitude-change.cc index 27b71ecfcf..fcfcf2d2a9 100644 --- a/crawl-ref/source/attitude-change.cc +++ b/crawl-ref/source/attitude-change.cc @@ -230,24 +230,24 @@ bool unholy_and_evil_beings_attitude_change() return (apply_to_all_dungeons(_unholy_and_evil_beings_on_level_attitude_change)); } -static bool _chaotic_beings_on_level_attitude_change() +static bool _unclean_and_chaotic_beings_on_level_attitude_change() { bool success = false; for (monster_iterator mi; mi; ++mi) { - if (!mi->is_chaotic()) + if (!mi->is_unclean() && !mi->is_chaotic()) continue; #ifdef DEBUG_DIAGNOSTICS - mprf(MSGCH_DIAGNOSTICS, "Chaotic attitude changing: %s on level %d, branch %d", + mprf(MSGCH_DIAGNOSTICS, "Unclean/chaotic attitude changing: %s on level %d, branch %d", mi->name(DESC_PLAIN).c_str(), static_cast<int>(you.your_level), static_cast<int>(you.where_are_you)); #endif // If you worship Zin, you make all friendly and good neutral - // chaotic beings hostile. + // unclean and chaotic beings hostile. if (you.religion == GOD_ZIN && mi->wont_attack()) { mi->attitude = ATT_HOSTILE; @@ -261,9 +261,9 @@ static bool _chaotic_beings_on_level_attitude_change() return (success); } -bool chaotic_beings_attitude_change() +bool unclean_and_chaotic_beings_attitude_change() { - return (apply_to_all_dungeons(_chaotic_beings_on_level_attitude_change)); + return (apply_to_all_dungeons(_unclean_and_chaotic_beings_on_level_attitude_change)); } static bool _spellcasters_on_level_attitude_change() |