Add a few more miscellaneous minor fixes.

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

1 files changed, 8 insertions, 8 deletions

diff --git a/crawl-ref/source/spells3.cc b/crawl-ref/source/spells3.cc
index 6f0d5cc944..93392a3224 100644
--- a/crawl-ref/source/spells3.cc
+++ b/crawl-ref/source/spells3.cc
@@ -559,10 +559,12 @@ bool cast_summon_greater_demon(int pow, bool god_gift)
     return (success);
 }
 
-bool cast_shadow_creatures(bool god_gift)
+bool cast_shadow_creatures(god_type god)
 {
     bool success = false;
 
+    mpr("Wisps of shadow whirl around you...");
+
     const int monster =
         create_monster(
             mgen_data(RANDOM_MONSTER, BEH_FRIENDLY, 2,
@@ -573,8 +575,6 @@ bool cast_shadow_creatures(bool god_gift)
     {
         success = true;
 
-        mpr("Wisps of shadow whirl around you...");
-
         player_angers_monster(&menv[monster]);
     }
     else
@@ -972,6 +972,9 @@ int animate_dead(actor *caster, int pow, beh_type beha, unsigned short hitting,
                 {
                     const item_def& item = mitm[corps];
 
+                    if (is_being_butchered(item, false))
+                        was_butchering = true;
+
                     if (animate_a_corpse(a.x, a.y, CORPSE_BODY, beha,
                                          hitting, god_gift, actual, true))
                     {
@@ -980,9 +983,6 @@ int animate_dead(actor *caster, int pow, beh_type beha, unsigned short hitting,
                         if (see_grid(env.show, you.pos(), a))
                             number_seen++;
 
-                        if (is_being_butchered(item, false))
-                            was_butchering = true;
-
                         break;
                     }
 
@@ -1141,8 +1141,8 @@ bool cast_twisted_resurrection(int pow, bool god_gift)
 
     const int monster =
         create_monster(
-            mgen_data(mon, BEH_FRIENDLY, 0,
-                      you.pos(), you.pet_target,
+            mgen_data(mon, BEH_FRIENDLY,
+                      0, you.pos(), you.pet_target,
                       (god_gift ? MG_GOD_GIFT : 0) | MG_FORCE_BEH,
                       MONS_PROGRAM_BUG, 0, colour));