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, 10 insertions, 1 deletions

diff --git a/crawl-ref/source/view.cc b/crawl-ref/source/view.cc
index bd31e5be63..a1f462e987 100644
--- a/crawl-ref/source/view.cc
+++ b/crawl-ref/source/view.cc
@@ -2976,8 +2976,16 @@ void show_map( FixedVector<int, 2> &spec_place, bool travel_mode )
 }                               // end show_map()
 
 
-void magic_mapping(int map_radius, int proportion)
+// Returns true if succeeded
+bool magic_mapping(int map_radius, int proportion, bool force)
 {
+    if (!force &&
+        ((you.level_type == LEVEL_ABYSS) ||
+         (you.level_type == LEVEL_LABYRINTH && you.species != SP_MINOTAUR)))
+    {
+        return false;
+    }
+
     int i, j, k, l, empty_count;
 
     if (map_radius > 50 && map_radius != 1000)
@@ -3060,6 +3068,7 @@ void magic_mapping(int map_radius, int proportion)
             }
         }
     }
+    return true;
 }                               // end magic_mapping()
 
 // realize that this is simply a repackaged version of