From ec227f5a38e5a1d1962e02fe6ec088a21f5b36a7 Mon Sep 17 00:00:00 2001
From: Bodrick <bodricklight@gmail.com>
Date: Mon, 17 Aug 2015 22:33:17 +0100
Subject: [PATCH] Remove odd message if rejoining the same good god

If you leave a good god, then rejoin that same god again, you get a
message similar to "Zin says: Farewell. Go and enforce order with Zin."
---
 crawl-ref/source/religion.cc | 35 +++++++++++++++++++----------------
 1 file changed, 19 insertions(+), 16 deletions(-)

diff --git a/crawl-ref/source/religion.cc b/crawl-ref/source/religion.cc
index 6c266e3..db9bdbc 100644
--- a/crawl-ref/source/religion.cc
+++ b/crawl-ref/source/religion.cc
@@ -3518,23 +3518,26 @@ void join_religion(god_type which_god, bool immediate)
         }
         if (is_good_god(effective_old_god))
         {
-            // Some feedback that piety moved over.
-            switch (you.religion)
+            if (you.religion != effective_old_god)
             {
-            case GOD_ELYVILON:
-                simple_god_message((" says: Farewell. Go and aid the meek with "
-                                   + god_name(you.religion) + ".").c_str(), effective_old_god);
-                break;
-            case GOD_SHINING_ONE:
-                simple_god_message((" says: Farewell. Go and vanquish evil with "
-                                   + god_name(you.religion) + ".").c_str(), effective_old_god);
-                break;
-            case GOD_ZIN:
-                simple_god_message((" says: Farewell. Go and enforce order with "
-                                   + god_name(you.religion) + ".").c_str(), effective_old_god);
-                break;
-            default:
-                mprf(MSGCH_ERROR, "Unknown good god.");
+                // Some feedback that piety moved over.
+                switch (you.religion)
+                {
+                case GOD_ELYVILON:
+                    simple_god_message((" says: Farewell. Go and aid the meek with "
+                                       + god_name(you.religion) + ".").c_str(), effective_old_god);
+                    break;
+                case GOD_SHINING_ONE:
+                    simple_god_message((" says: Farewell. Go and vanquish evil with "
+                                       + god_name(you.religion) + ".").c_str(), effective_old_god);
+                    break;
+                case GOD_ZIN:
+                    simple_god_message((" says: Farewell. Go and enforce order with "
+                                       + god_name(you.religion) + ".").c_str(), effective_old_god);
+                    break;
+                default:
+                    mprf(MSGCH_ERROR, "Unknown good god.");
+                }
             }
             // Give a piety bonus when switching between good gods.
             if (effective_old_piety > piety_breakpoint(0))
-- 
2.1.0