diff options
| author | dolorous <dolorous@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-04-19 23:38:07 +0000 |
|---|---|---|
| committer | dolorous <dolorous@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-04-19 23:38:07 +0000 |
| commit | 3a736d2bc2536ceaa45a9b6646c64b3a92132171 (patch) | |
| tree | 543af2132e0a69a869e05a90b5b41ee77e93419d /crawl-ref/source/ouch.cc | |
| parent | a3cdba5e574e71ac75b07c41ab42d87efb4b42fe (diff) | |
| download | crawl-ref-3a736d2bc2536ceaa45a9b6646c64b3a92132171.tar.gz crawl-ref-3a736d2bc2536ceaa45a9b6646c64b3a92132171.zip | |
Clean up follower and cleansing flame routines some more. If you
worship a good god, cleansing flame will no longer damage neutral
monsters, since attacking neutrals offends the good gods.
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@4393 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/ouch.cc')
| -rw-r--r-- | crawl-ref/source/ouch.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/crawl-ref/source/ouch.cc b/crawl-ref/source/ouch.cc index fa15841a3a..46f7e76462 100644 --- a/crawl-ref/source/ouch.cc +++ b/crawl-ref/source/ouch.cc @@ -241,10 +241,10 @@ int check_your_resists(int hurted, beam_type flavour) break; case BEAM_HOLY: - if (you.is_undead || you.species != SP_DEMONSPAWN) - hurted = (hurted * 3) / 2; - else if (is_good_god(you.religion)) + if (is_good_god(you.religion)) hurted = 0; + else if (you.is_undead || you.species != SP_DEMONSPAWN) + hurted = (hurted * 3) / 2; else if (!is_evil_god(you.religion)) hurted /= 2; |