Apply trunk r6462 to 0.4.

git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/branches/stone_soup-0.4@6468 c06c8d41-db1a-0410-9941-cceddc491573

1 files changed, 3 insertions, 6 deletions

diff --git a/crawl-ref/source/religion.cc b/crawl-ref/source/religion.cc
index f07b656b95..21dda6e4e3 100644
--- a/crawl-ref/source/religion.cc
+++ b/crawl-ref/source/religion.cc
@@ -4944,13 +4944,10 @@ void excommunication(god_type new_god)
         break;
     }
 
-    // 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(old_god) && !is_good_god(new_god)
-        && _holy_beings_attitude_change())
-    {
+    // When you start worshipping 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())
         mpr("The divine host forsakes you.", MSGCH_MONSTER_ENCHANT);
-    }
 
     learned_something_new(TUT_EXCOMMUNICATE, (int)new_god, old_piety);
 }