From da2bfae4d158f57ebb3f4f6d07c54cb7cbd85ba2 Mon Sep 17 00:00:00 2001
From: dolorous <dolorous@c06c8d41-db1a-0410-9941-cceddc491573>
Date: Tue, 24 Jun 2008 03:26:09 +0000
Subject: Simplify.

git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@6100 c06c8d41-db1a-0410-9941-cceddc491573
---
 crawl-ref/source/spells2.cc | 17 +++++++----------
 crawl-ref/source/spells2.h  |  2 +-
 crawl-ref/source/xom.cc     | 12 ++++++------
 3 files changed, 14 insertions(+), 17 deletions(-)

diff --git a/crawl-ref/source/spells2.cc b/crawl-ref/source/spells2.cc
index 1fbef13c7e..865bbd514b 100644
--- a/crawl-ref/source/spells2.cc
+++ b/crawl-ref/source/spells2.cc
@@ -1760,7 +1760,7 @@ bool summon_daeva(int pow, god_type god, bool quiet)
 }
 
 bool cast_tukimas_dance(int pow, god_type god,
-                        bool force_hostile, bool quiet_failure)
+                        bool force_hostile)
 {
     bool success = true;
 
@@ -1806,17 +1806,14 @@ bool cast_tukimas_dance(int pow, god_type god,
     {
         destroy_item(i);
 
-        if (!quiet_failure)
+        if (wpn != -1)
         {
-            if (wpn != -1)
-            {
-                mprf("%s vibrates crazily for a second.",
-                     you.inv[wpn].name(DESC_CAP_YOUR).c_str());
-            }
-            else
-                msg::stream << "Your " << your_hand(true) << " twitch."
-                            << std::endl;
+            mprf("%s vibrates crazily for a second.",
+                 you.inv[wpn].name(DESC_CAP_YOUR).c_str());
         }
+        else
+            msg::stream << "Your " << your_hand(true) << " twitch."
+                        << std::endl;
 
         return (false);
     }
diff --git a/crawl-ref/source/spells2.h b/crawl-ref/source/spells2.h
index 8cd5b9cfb9..3f7a3a32d3 100644
--- a/crawl-ref/source/spells2.h
+++ b/crawl-ref/source/spells2.h
@@ -156,7 +156,7 @@ bool summon_daeva(int pow, god_type god = GOD_NO_GOD, bool quiet = false);
  * called from: ability - religion - spell
  * *********************************************************************** */
 bool cast_tukimas_dance(int pow, god_type god = GOD_NO_GOD,
-                        bool force_hostile = false, bool quiet_failure = false);
+                        bool force_hostile = false);
 
 // last updated 24may2000 {dlb}
 /* ***********************************************************************
diff --git a/crawl-ref/source/xom.cc b/crawl-ref/source/xom.cc
index e1155741b6..c220246224 100644
--- a/crawl-ref/source/xom.cc
+++ b/crawl-ref/source/xom.cc
@@ -852,7 +852,7 @@ static bool _xom_is_bad(int sever)
 
             // Nasty, but fun.
             if (one_chance_in(4))
-                success = cast_tukimas_dance(100, GOD_XOM, true, true);
+                success = cast_tukimas_dance(100, GOD_XOM, true);
             else
             {
                 const int numdemons =
@@ -868,12 +868,12 @@ static bool _xom_is_bad(int sever)
                         success = true;
                     }
                 }
-            }
 
-            if (!success)
-            {
-                simple_god_message("'s children are having fun elsewhere.",
-                                   GOD_XOM);
+                if (!success)
+                {
+                    simple_god_message("'s children are having fun elsewhere.",
+                                       GOD_XOM);
+                }
             }
 
             done = true;
-- 
cgit v1.2.3-54-g00ecf