summaryrefslogtreecommitdiffstats
path: root/crawl-ref/source/travel.cc
diff options
context:
space:
mode:
Diffstat (limited to 'crawl-ref/source/travel.cc')
-rw-r--r--crawl-ref/source/travel.cc7
1 files changed, 5 insertions, 2 deletions
diff --git a/crawl-ref/source/travel.cc b/crawl-ref/source/travel.cc
index 3295f550a3..c6b3ccbb53 100644
--- a/crawl-ref/source/travel.cc
+++ b/crawl-ref/source/travel.cc
@@ -931,7 +931,10 @@ void explore_pickup_event(int did_pickup, int tried_pickup)
"Could not pick up %s here, shall I ignore %s? ",
tried_pickup == 1? "an item" : "some items",
tried_pickup == 1? "it" : "them");
- if (yesno(prompt.c_str(), true, 'y', true, false))
+ // Make Escape => 'n' and stop run.
+ explicit_keymap map;
+ map[ESCAPE] = 'n';
+ if (yesno(prompt.c_str(), true, 'y', true, false, false, &map))
{
mark_items_non_pickup_at(you.pos());
// Don't stop explore.
@@ -3896,7 +3899,7 @@ void explore_discoveries::found_item(const coord_def &pos, const item_def &i)
es_flags |= ES_ITEM;
}
-// Expensive O(n2) duplicate search, but we can live with that.
+// Expensive O(n^2) duplicate search, but we can live with that.
template <class citer> bool explore_discoveries::has_duplicates(
citer begin, citer end) const
{