summaryrefslogtreecommitdiffstats
path: root/crawl-ref/source/spl-transloc.h
diff options
context:
space:
mode:
authorNicholas Feinberg <pleasingfung@gmail.com>2014-07-06 20:18:29 -0700
committerNicholas Feinberg <pleasingfung@gmail.com>2014-07-06 21:25:24 -0700
commit86e6aab275a7d347a98cd5a929112b044bb0182b (patch)
tree80c99af3defd0721afc4dda5704dd8878a8cd3e6 /crawl-ref/source/spl-transloc.h
parent458000e744c6aea39487b17d91026549e5fd3c1b (diff)
downloadcrawl-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/spl-transloc.h')
-rw-r--r--crawl-ref/source/spl-transloc.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/crawl-ref/source/spl-transloc.h b/crawl-ref/source/spl-transloc.h
index d4abf1ba73..0a59654e00 100644
--- a/crawl-ref/source/spl-transloc.h
+++ b/crawl-ref/source/spl-transloc.h
@@ -7,7 +7,7 @@ spret_type cast_controlled_blink(int pow, bool fail);
spret_type cast_disjunction(int pow, bool fail);
void disjunction();
int blink(int pow, bool high_level_controlled_blink, bool wizard_blink = false,
- string *pre_msg = NULL);
+ string *pre_msg = NULL, bool safely_cancellable = false);
spret_type cast_blink(bool allow_partial_control, bool fail);
void random_blink(bool, bool override_abyss = false, bool override_stasis = false);