Clean up handling of the "[Your followers] forsake you." messages when

switching gods.


git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@5303 c06c8d41-db1a-0410-9941-cceddc491573

1 files changed, 14 insertions, 14 deletions

diff --git a/crawl-ref/source/religion.cc b/crawl-ref/source/religion.cc
index 5ee6d154f4..8048682a4e 100644
--- a/crawl-ref/source/religion.cc
+++ b/crawl-ref/source/religion.cc
@@ -4458,11 +4458,8 @@ 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))
-    {
-        if (_holy_beings_attitude_change())
-            mpr("The divine host forsakes you.", MSGCH_MONSTER_ENCHANT);
-    }
+    if (!is_good_god(new_god) && _holy_beings_attitude_change())
+        mpr("The divine host forsakes you.", MSGCH_MONSTER_ENCHANT);
 }                               // end excommunication()
 
 static bool _bless_weapon( god_type god, int brand, int colour )
@@ -5009,20 +5006,23 @@ void god_pitch(god_type which_god)
     simple_god_message( info );
     more();
 
+    // When you start worshipping a good god, you make all non-hostile
+    // evil and unholy beings hostile, and when you start worshipping
+    // Trog, you make all non-hostile magic users hostile.
+    if (is_good_god(you.religion) && _evil_beings_attitude_change())
+        mpr("Your evil allies forsake you.", MSGCH_MONSTER_ENCHANT);
+    else if (you.religion == GOD_TROG && _magic_users_attitude_change())
+        mpr("Your magic-using allies forsake you.", MSGCH_MONSTER_ENCHANT);
+
     if (you.religion == GOD_ELYVILON)
     {
-        mpr("You can now call upon Elyvilon to destroy weapons "
-            "lying on the ground.", MSGCH_GOD);
+        mpr("You can now call upon Elyvilon to destroy weapons lying "
+            "on the ground.", MSGCH_GOD);
     }
     else if (you.religion == GOD_TROG)
     {
-        // When you start worshipping Trog, you make all non-hostile
-        // magic users hostile.
-        if (_magic_users_attitude_change())
-            mpr("Your magic-using allies forsake you.", MSGCH_MONSTER_ENCHANT);
-
-        mpr("You can now call upon Trog to burn spellbooks in your surroundings.",
-            MSGCH_GOD);
+        mpr("You can now call upon Trog to burn spellbooks in your "
+            "surroundings.", MSGCH_GOD);
     }
 
     if (you.worshipped[you.religion] < 100)