4 files changed, 26 insertions, 26 deletions
diff --git a/crawl-ref/source/spells2.h b/crawl-ref/source/spells2.h
index 068378a2a5..6a6d1bb0d0 100644
--- a/crawl-ref/source/spells2.h
+++ b/crawl-ref/source/spells2.h
@@ -14,7 +14,7 @@
 #define SPELLS2_H
 
 #include "enum.h"
-#include "itemprop.h"  // from brand_type
+#include "itemprop.h"  // from brand_type()
 
 struct dist;
 
diff --git a/crawl-ref/source/spells3.cc b/crawl-ref/source/spells3.cc
index 415f38f39c..07250c2722 100644
--- a/crawl-ref/source/spells3.cc
+++ b/crawl-ref/source/spells3.cc
@@ -560,6 +560,25 @@ bool summon_demon_type(monster_type mon, int pow, bool god_gift)
     return (success);
 }
 
+bool cast_shadow_creatures(bool god_gift)
+{
+    bool success = false;
+
+    if (create_monster(
+           mgen_data(RANDOM_MONSTER, BEH_FRIENDLY, 2,
+                     you.pos(), you.pet_target,
+                     god_gift ? MF_GOD_GIFT : 0)) != -1)
+    {
+        success = true;
+
+        mpr("Wisps of shadow whirl around you...");
+    }
+    else
+        canned_msg(MSG_NOTHING_HAPPENS);
+
+    return (success);
+}
+
 bool cast_summon_horrible_things(int pow, bool god_gift)
 {
     if (one_chance_in(3)
@@ -616,7 +635,7 @@ bool cast_summon_horrible_things(int pow, bool god_gift)
     if (count > 0)
     {
         mprf("Some Thing%s answered your call!",
-             (count > 1) ? "s" : "");
+             count > 1 ? "s" : "");
         return (true);
     }
 
@@ -690,25 +709,6 @@ bool cast_simulacrum(int pow, bool god_gift)
     return (false);
 }
 
-bool cast_shadow_creatures(bool god_gift)
-{
-    bool success = false;
-
-    if (create_monster(
-           mgen_data(RANDOM_MONSTER, BEH_FRIENDLY, 2,
-                     you.pos(), you.pet_target,
-                     god_gift ? MF_GOD_GIFT : 0)) != -1)
-    {
-        success = true;
-
-        mpr("Wisps of shadow whirl around you...");
-    }
-    else
-        canned_msg(MSG_NOTHING_HAPPENS);
-
-    return (success);
-}
-
 bool cast_twisted_resurrection(int pow, bool god_gift)
 {
     if (igrd[you.x_pos][you.y_pos] == NON_ITEM)
diff --git a/crawl-ref/source/spells3.h b/crawl-ref/source/spells3.h
index 3b6456a443..842f31512f 100644
--- a/crawl-ref/source/spells3.h
+++ b/crawl-ref/source/spells3.h
@@ -120,10 +120,10 @@ bool summon_demon_type(monster_type mon, int pow, bool god_gift = false);
 bool cast_summon_demon(int pow, bool god_gift = false);
 bool cast_demonic_horde(int pow, bool god_gift = false);
 bool cast_summon_greater_demon(int pow, bool god_gift = false);
+bool cast_shadow_creatures(bool god_gift = false);
 bool cast_summon_horrible_things(int pow, bool god_gift = false);
 
 bool cast_simulacrum(int pow, bool god_gift = false);
-bool cast_shadow_creatures(bool god_gift = false);
 bool cast_twisted_resurrection(int pow, bool god_gift = false);
 bool cast_summon_wraiths(int pow, bool god_gift = false);
 bool cast_death_channel(int pow, bool god_gift = false);
diff --git a/crawl-ref/source/spl-cast.cc b/crawl-ref/source/spl-cast.cc
index fa9acad1a2..cf7ed6063c 100644
--- a/crawl-ref/source/spl-cast.cc
+++ b/crawl-ref/source/spl-cast.cc
@@ -1519,6 +1519,10 @@ spret_type your_spells(spell_type spell, int powc, bool allow_fail)
         cast_summon_greater_demon(powc);
         break;
 
+    case SPELL_SHADOW_CREATURES:
+        cast_shadow_creatures();
+        break;
+
     case SPELL_SUMMON_HORRIBLE_THINGS:
         cast_summon_horrible_things(powc);
         break;
@@ -1527,10 +1531,6 @@ spret_type your_spells(spell_type spell, int powc, bool allow_fail)
         cast_simulacrum(powc);
         break;
 
-    case SPELL_SHADOW_CREATURES:
-        cast_shadow_creatures();
-        break;
-
     case SPELL_TWISTED_RESURRECTION:
         cast_twisted_resurrection(powc);
         break;