Properly handle Xom's failing to summon hostile monsters.

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

1 files changed, 13 insertions, 5 deletions

diff --git a/crawl-ref/source/xom.cc b/crawl-ref/source/xom.cc
index a7278ef8c0..927ce9da47 100644
--- a/crawl-ref/source/xom.cc
+++ b/crawl-ref/source/xom.cc
@@ -850,11 +850,17 @@ static bool _xom_is_bad(int sever)
         }
         else if (random2(sever) <= 9)
         {
-            god_speaks(GOD_XOM, _get_xom_speech("hostile monster"));
+            const char *speech = _get_xom_speech("hostile monster");
 
             // Nasty, but fun.
             if (one_chance_in(4))
+            {
+                god_speaks(GOD_XOM, speech);
+
                 cast_tukimas_dance(100, GOD_XOM, true);
+
+                done = true;
+            }
             else
             {
                 const int numdemons =
@@ -873,11 +879,13 @@ static bool _xom_is_bad(int sever)
                     }
                 }
 
-                if (!success)
-                    god_speaks(GOD_XOM, "\"No, never mind.\"");
-            }
+                if (success)
+                {
+                    god_speaks(GOD_XOM, speech);
 
-            done = true;
+                    done = true;
+                }
+            }
         }
         else if (random2(sever) <= 10)
         {