summaryrefslogtreecommitdiffstats
path: root/crawl-ref/source/religion.cc
diff options
context:
space:
mode:
authordolorous <dolorous@c06c8d41-db1a-0410-9941-cceddc491573>2008-06-30 22:18:12 +0000
committerdolorous <dolorous@c06c8d41-db1a-0410-9941-cceddc491573>2008-06-30 22:18:12 +0000
commit2a0b4dc76b699aa56ba5ab652368e188a97d7a1e (patch)
treeacd491a28b3e121990fcbddd44e7ba18324a3e07 /crawl-ref/source/religion.cc
parent089ab80ae84d9abf71ab1ac12f6e852781b76437 (diff)
downloadcrawl-ref-2a0b4dc76b699aa56ba5ab652368e188a97d7a1e.tar.gz
crawl-ref-2a0b4dc76b699aa56ba5ab652368e188a97d7a1e.zip
Only attempt to change the attitudes of holy beings if we're dumping a
good god, not if we're dumping any god. git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@6268 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/religion.cc')
-rw-r--r--crawl-ref/source/religion.cc7
1 files changed, 5 insertions, 2 deletions
diff --git a/crawl-ref/source/religion.cc b/crawl-ref/source/religion.cc
index c453be7e23..1966e9b047 100644
--- a/crawl-ref/source/religion.cc
+++ b/crawl-ref/source/religion.cc
@@ -4910,11 +4910,14 @@ void excommunication(god_type new_god)
// When you leave one of the good gods for a non-good god, or no
// god, you make all non-hostile holy beings hostile.
- if (!is_good_god(new_god) && _holy_beings_attitude_change())
+ if (is_good_god(old_god) && !is_good_god(new_god)
+ && _holy_beings_attitude_change())
+ {
mpr("The divine host forsakes you.", MSGCH_MONSTER_ENCHANT);
+ }
learned_something_new(TUT_EXCOMMUNICATE, (int)new_god, old_piety);
-} // end excommunication()
+}
static bool _bless_weapon( god_type god, int brand, int colour )
{