summaryrefslogtreecommitdiffstats
path: root/crawl-ref/source/item_use.cc
diff options
context:
space:
mode:
authorj-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573>2007-09-13 11:20:50 +0000
committerj-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573>2007-09-13 11:20:50 +0000
commitbdf7790e177b672f18af015211f2f69e84c6c1cb (patch)
tree53e8eab16341fe2049b6149cbbc9ca81b1ce63a5 /crawl-ref/source/item_use.cc
parent40e4b8b58a0d57fff3b24aeff8dedd26b9d10427 (diff)
downloadcrawl-ref-bdf7790e177b672f18af015211f2f69e84c6c1cb.tar.gz
crawl-ref-bdf7790e177b672f18af015211f2f69e84c6c1cb.zip
Cleaning up magic mapping. Patch by dolorous.
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@2078 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/item_use.cc')
-rw-r--r--crawl-ref/source/item_use.cc16
1 files changed, 11 insertions, 5 deletions
diff --git a/crawl-ref/source/item_use.cc b/crawl-ref/source/item_use.cc
index 7b92068049..aad322f3c9 100644
--- a/crawl-ref/source/item_use.cc
+++ b/crawl-ref/source/item_use.cc
@@ -3640,12 +3640,18 @@ void read_scroll(void)
break;
case SCR_MAGIC_MAPPING:
- id_the_scroll = magic_mapping(50, 90 + random2(11));
-
- if ( id_the_scroll )
- mpr("You feel aware of your surroundings.");
+ if (you.level_type == LEVEL_PANDEMONIUM)
+ {
+ if (!item_type_known(scroll))
+ {
+ mpr("You feel momentarily disoriented.");
+ id_the_scroll = false;
+ }
+ else
+ mpr("Your Earth magic cannot map Pandemonium.");
+ }
else
- mpr("You feel momentarily disoriented.");
+ id_the_scroll = magic_mapping(50, 90 + random2(11), false);
break;
case SCR_TORMENT: