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/abl-show.cc b/crawl-ref/source/abl-show.cc
index 8dbb11752d..ce87fb2f07 100644
--- a/crawl-ref/source/abl-show.cc
+++ b/crawl-ref/source/abl-show.cc
@@ -1548,9 +1548,13 @@ static bool _do_ability(const ability_def& abil)
         break;
 
     case ABIL_YRED_ANIMATE_REMAINS:
-        mpr("You call on the dead to walk for you...");
-        animate_remains(you.pos(), CORPSE_BODY, BEH_FRIENDLY, you.pet_target,
-                        GOD_YREDELEMNUL);
+        mpr("You attempt to give life to the dead...");
+
+        if (animate_remains(you.pos(), CORPSE_BODY, BEH_FRIENDLY,
+                            you.pet_target, GOD_YREDELEMNUL) < 0)
+        {
+            mpr("There are no remains here to animate!");
+        }
         exercise(SK_INVOCATIONS, 2 + random2(4));
         break;
 
@@ -1561,6 +1565,7 @@ static bool _do_ability(const ability_def& abil)
 
     case ABIL_YRED_ANIMATE_DEAD:
         mpr("You call on the dead to walk for you...");
+
         animate_dead(&you, 1 + you.skills[SK_INVOCATIONS], BEH_FRIENDLY,
                      you.pet_target, GOD_YREDELEMNUL);
         exercise(SK_INVOCATIONS, 2 + random2(4));