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/spl-transloc.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/spl-transloc.cc')
| -rw-r--r-- | crawl-ref/source/spl-transloc.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/crawl-ref/source/spl-transloc.cc b/crawl-ref/source/spl-transloc.cc index c0d8ed2338..fa32d66619 100644 --- a/crawl-ref/source/spl-transloc.cc +++ b/crawl-ref/source/spl-transloc.cc @@ -110,7 +110,7 @@ void disjunction() // a monster being at the target spot), and the player gains no // contamination. int blink(int pow, bool high_level_controlled_blink, bool wizard_blink, - string *pre_msg) + string *pre_msg, bool safely_cancellable) { ASSERT(!crawl_state.game_is_arena()); @@ -178,7 +178,7 @@ int blink(int pow, bool high_level_controlled_blink, bool wizard_blink, if (!beam.isValid || beam.target == you.pos()) { - if (!wizard_blink + if (!wizard_blink && !safely_cancellable && !yesno("Are you sure you want to cancel this blink?", false, 'n')) { |