Clean up still more.

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

3 files changed, 3 insertions, 9 deletions

diff --git a/crawl-ref/source/spells2.cc b/crawl-ref/source/spells2.cc
index 0d1a70149d..16bc5b3cf6 100644
--- a/crawl-ref/source/spells2.cc
+++ b/crawl-ref/source/spells2.cc
@@ -1866,12 +1866,6 @@ bool summon_general_creature_spell(spell_type spell, int pow,
     {
         switch (spell)
         {
-            case SPELL_CALL_IMP:
-                mon = (one_chance_in(3)) ? MONS_WHITE_IMP :
-                      (one_chance_in(7)) ? MONS_SHADOW_IMP
-                                         : MONS_IMP;
-                break;
-
             case SPELL_SUMMON_DEMON:
             case SPELL_DEMONIC_HORDE:
             case SPELL_SUMMON_GREATER_DEMON:
diff --git a/crawl-ref/source/spells3.cc b/crawl-ref/source/spells3.cc
index e9392ec444..30a44a7134 100644
--- a/crawl-ref/source/spells3.cc
+++ b/crawl-ref/source/spells3.cc
@@ -473,7 +473,7 @@ void simulacrum(int power)
 }
 
 bool dancing_weapon(int pow, bool force_hostile,
-                    bool quiet_fail)
+                    bool quiet_failure)
 {
     bool success = true;
 
@@ -517,7 +517,7 @@ bool dancing_weapon(int pow, bool force_hostile,
     {
         destroy_item(i);
 
-        if (!quiet_fail)
+        if (!quiet_failure)
         {
             if (wpn != -1)
                 mpr("Your weapon vibrates crazily for a second.");
diff --git a/crawl-ref/source/spells3.h b/crawl-ref/source/spells3.h
index 74fdbcddd1..ef6560071e 100644
--- a/crawl-ref/source/spells3.h
+++ b/crawl-ref/source/spells3.h
@@ -83,7 +83,7 @@ bool project_noise(void);
  * called from: religion - spell
  * *********************************************************************** */
 bool dancing_weapon(int pow, bool force_hostile = false,
-                    bool quiet_fail = false);
+                    bool quiet_failure = false);
 
 
 // updated 24may2000 {dlb}