Cleaned up magic mapping: the test regarding whether you can magic map

is done inside magic_mapping(), which now returns a bool success value.
Functionally: this means that the randart magic mapping power can no
longer map the Abyss or labyrinths, ditto Map card.
We can change this part back if we want.


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

1 files changed, 6 insertions, 6 deletions

diff --git a/crawl-ref/source/it_use3.cc b/crawl-ref/source/it_use3.cc
index 52cd5065ad..15296e5a3e 100644
--- a/crawl-ref/source/it_use3.cc
+++ b/crawl-ref/source/it_use3.cc
@@ -697,19 +697,19 @@ static bool ball_of_seeing(void)
     {
         confuse_player( 10 + random2(10), false );
     }
-    else if (use < 15
-             || (you.level_type == LEVEL_LABYRINTH &&
-                 you.species != SP_MINOTAUR)
-             || you.level_type == LEVEL_ABYSS || coinflip())
+    else if (use < 15 || coinflip())
     {
         mpr("You see nothing.");
     }
-    else
+    else if (magic_mapping( 15, 50 + random2( you.skills[SK_EVOCATIONS])))
     {
         mpr("You see a map of your surroundings!");
-        magic_mapping( 15, 50 + random2( you.skills[SK_EVOCATIONS] ) );
         ret = true;
     }
+    else
+    {
+        mpr("You see nothing.");
+    }
 
     return (ret);
 }                               // end ball_of_seeing()