diff options
author | Nicholas Feinberg <pleasingfung@gmail.com> | 2014-07-06 20:18:29 -0700 |
---|---|---|
committer | Nicholas Feinberg <pleasingfung@gmail.com> | 2014-07-06 21:25:24 -0700 |
commit | 86e6aab275a7d347a98cd5a929112b044bb0182b (patch) | |
tree | 80c99af3defd0721afc4dda5704dd8878a8cd3e6 /crawl-ref/source/item_use.cc | |
parent | 458000e744c6aea39487b17d91026549e5fd3c1b (diff) | |
download | crawl-ref-86e6aab275a7d347a98cd5a929112b044bb0182b.tar.gz crawl-ref-86e6aab275a7d347a98cd5a929112b044bb0182b.zip |
Clean up ?blink
Make it only prompt for cancellation when that would actually
waste the scroll, and remove some archaic checks to avoid
iding -tele equipment for free (since that's all auto-id'd now
anyway!)
Diffstat (limited to 'crawl-ref/source/item_use.cc')
-rw-r--r-- | crawl-ref/source/item_use.cc | 14 |
1 files changed, 3 insertions, 11 deletions
diff --git a/crawl-ref/source/item_use.cc b/crawl-ref/source/item_use.cc index 899f91f084..9a36abb862 100644 --- a/crawl-ref/source/item_use.cc +++ b/crawl-ref/source/item_use.cc @@ -2849,17 +2849,9 @@ void read_scroll(int slot) break; case SCR_BLINKING: - // XXX Because some checks in blink() are made before players get to - // choose target location it is possible to "abuse" scrolls' free - // cancelling to get some normally hidden information (i.e. presence - // of (unidentified) -Tele gear). - if (!alreadyknown) - { - mpr(pre_succ_msg.c_str()); - blink(1000, false); - } - else - cancel_scroll = (blink(1000, false, false, &pre_succ_msg) == -1); + cancel_scroll = (blink(1000, false, false, + &pre_succ_msg, alreadyknown) == -1 + && alreadyknown); break; case SCR_TELEPORTATION: |