Make messages for animating single skeletons/corpses versus multiple

ones consistent.  Also, display a proper warning message if a player 
tries to animate a single skeleton/corpse while not actually standing on 
one.


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

1 files changed, 8 insertions, 3 deletions

diff --git a/crawl-ref/source/spl-cast.cc b/crawl-ref/source/spl-cast.cc
index f26f102fbf..7b9c50fdec 100644
--- a/crawl-ref/source/spl-cast.cc
+++ b/crawl-ref/source/spl-cast.cc
@@ -1597,12 +1597,17 @@ spret_type your_spells(spell_type spell, int powc, bool allow_fail)
 
     case SPELL_ANIMATE_SKELETON:
         mpr("You attempt to give life to the dead...");
-        animate_remains(you.pos(), CORPSE_SKELETON, BEH_FRIENDLY,
-                        you.pet_target, god);
+
+        if (animate_remains(you.pos(), CORPSE_SKELETON, BEH_FRIENDLY,
+                            you.pet_target, god) < 0)
+        {
+            mpr("There is no skeleton here to animate!");
+        }
         break;
 
     case SPELL_ANIMATE_DEAD:
-        mpr("You call on the dead to walk for you.");
+        mpr("You call on the dead to walk for you...");
+
         animate_dead(&you, powc + 1, BEH_FRIENDLY, you.pet_target, god);
         break;