diff options
| author | haranp <haranp@c06c8d41-db1a-0410-9941-cceddc491573> | 2007-07-13 08:30:23 +0000 |
|---|---|---|
| committer | haranp <haranp@c06c8d41-db1a-0410-9941-cceddc491573> | 2007-07-13 08:30:23 +0000 |
| commit | b2785dc1f36e4f1dae161a3207ac25e083ba68b1 (patch) | |
| tree | dc3acd27d0c2890534899f01115247839b4147ca /crawl-ref/source/item_use.cc | |
| parent | f2903290696c79d076a099db8b0eba67793ddbb9 (diff) | |
| download | crawl-ref-b2785dc1f36e4f1dae161a3207ac25e083ba68b1.tar.gz crawl-ref-b2785dc1f36e4f1dae161a3207ac25e083ba68b1.zip | |
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
Diffstat (limited to 'crawl-ref/source/item_use.cc')
| -rw-r--r-- | crawl-ref/source/item_use.cc | 15 |
1 files changed, 5 insertions, 10 deletions
diff --git a/crawl-ref/source/item_use.cc b/crawl-ref/source/item_use.cc index 43ae1f47d4..183c7d3d14 100644 --- a/crawl-ref/source/item_use.cc +++ b/crawl-ref/source/item_use.cc @@ -3399,17 +3399,12 @@ void read_scroll(void) break; case SCR_MAGIC_MAPPING: - if ( (you.level_type == LEVEL_LABYRINTH && you.species != SP_MINOTAUR) - || you.level_type == LEVEL_ABYSS) - { - mpr("You feel momentarily disoriented."); - id_the_scroll = false; - } - else - { + id_the_scroll = magic_mapping(50, 90 + random2(11)); + + if ( id_the_scroll ) mpr("You feel aware of your surroundings."); - magic_mapping(50, 90 + random2(11)); - } + else + mpr("You feel momentarily disoriented."); break; case SCR_TORMENT: |