diff options
| author | Adam Borowski <kilobyte@angband.pl> | 2009-12-14 12:50:49 +0100 |
|---|---|---|
| committer | Adam Borowski <kilobyte@angband.pl> | 2009-12-14 12:50:49 +0100 |
| commit | 7b4b174763ca9f1d80d8c8d5cea34df86f4a8f16 (patch) | |
| tree | d85028e9f8ac70f34e7f3efcd93af4991ae82e25 /crawl-ref/source/religion.cc | |
| parent | 421ef9076d48db86629d1acea85d1f5c8e9747b0 (diff) | |
| download | crawl-ref-7b4b174763ca9f1d80d8c8d5cea34df86f4a8f16.tar.gz crawl-ref-7b4b174763ca9f1d80d8c8d5cea34df86f4a8f16.zip | |
Revert "Allow worshippers of good gods to kill hostile-neutral beings."
Diffstat (limited to 'crawl-ref/source/religion.cc')
| -rw-r--r-- | crawl-ref/source/religion.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/crawl-ref/source/religion.cc b/crawl-ref/source/religion.cc index 2cecaf6210..3aa2db88ff 100644 --- a/crawl-ref/source/religion.cc +++ b/crawl-ref/source/religion.cc @@ -2758,7 +2758,7 @@ bool did_god_conduct(conduct_type thing_done, int level, bool known, } break; - case DID_ATTACK_GOOD_NEUTRAL: + case DID_ATTACK_NEUTRAL: switch (you.religion) { case GOD_SHINING_ONE: @@ -3538,8 +3538,8 @@ void set_attack_conducts(god_conduct_trigger conduct[3], const monsters *mon, _first_attack_was_friendly[midx] = true; } } - else if (mon->good_neutral()) - conduct[0].set(DID_ATTACK_GOOD_NEUTRAL, 5, known, mon); + else if (mon->neutral()) + conduct[0].set(DID_ATTACK_NEUTRAL, 5, known, mon); if (is_unchivalric_attack(&you, mon) && (_first_attack_conduct[midx] |