Clean up the blessing routine a bit more.

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

1 files changed, 24 insertions, 12 deletions

diff --git a/crawl-ref/source/religion.cc b/crawl-ref/source/religion.cc
index 1c7c4b0de7..946229acae 100644
--- a/crawl-ref/source/religion.cc
+++ b/crawl-ref/source/religion.cc
@@ -938,21 +938,31 @@ void bless_follower(god_type god,
         // get out.
         if (monster == NON_MONSTER)
         {
-            if (god == GOD_BEOGH && chance <= 4)
+            if (chance <= 4)
             {
-                bool reinforced = beogh_blessing_reinforcement();
-
-                if (!reinforced || coinflip())
+                switch (god)
                 {
-                    if (beogh_blessing_reinforcement())
-                        reinforced = true;
-                }
+                    case GOD_BEOGH:
+                    {
+                        bool reinforced = beogh_blessing_reinforcement();
 
-                if (reinforced)
-                {
-                    blessed = "you";
-                    result = "reinforcement";
-                    goto blessing_done;
+                        if (!reinforced || coinflip())
+                        {
+                            if (beogh_blessing_reinforcement())
+                                reinforced = true;
+                        }
+
+                        if (reinforced)
+                        {
+                            blessed = "you";
+                            result = "reinforcement";
+                            goto blessing_done;
+                        }
+                        break;
+                   }
+
+                   default:
+                       break;
                 }
             }
 
@@ -978,6 +988,7 @@ void bless_follower(god_type god,
                     goto blessing_done;
                 }
                 break;
+
             case GOD_BEOGH:
                 // Turn a monster into a priestly monster, if possible.
                 if (beogh_blessing_priesthood(mon))
@@ -986,6 +997,7 @@ void bless_follower(god_type god,
                     goto blessing_done;
                 }
                 break;
+
             default:
                 break;
         }