summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatthew Cline <zelgadis@sourceforge.net>2009-11-13 23:00:50 -0800
committerMatthew Cline <zelgadis@sourceforge.net>2009-11-13 23:00:50 -0800
commit61b0b54b651ed84c0935eb5e41bca71a133af504 (patch)
tree6b4b5696e1a7b8dbe9769aa85bf99523f749c8a3
parent8a5051e7464fc686880aa6a07e3387b5dfa60c2d (diff)
downloadcrawl-ref-61b0b54b651ed84c0935eb5e41bca71a133af504.tar.gz
crawl-ref-61b0b54b651ed84c0935eb5e41bca71a133af504.zip
By default, don't stop explore for greedy pickup
-rw-r--r--crawl-ref/docs/options_guide.txt2
-rw-r--r--crawl-ref/source/initfile.cc4
2 files changed, 3 insertions, 3 deletions
diff --git a/crawl-ref/docs/options_guide.txt b/crawl-ref/docs/options_guide.txt
index 42a184c814..1128495065 100644
--- a/crawl-ref/docs/options_guide.txt
+++ b/crawl-ref/docs/options_guide.txt
@@ -818,7 +818,7 @@ explore_greedy = true
you're temporarily unable to pick up items (from uncontrolled
levitation, for instance).
-explore_stop = items,greedy_pickup,stairs,shops,altars,gates
+explore_stop = items,stairs,shops,altars,gates
Explore will stop for one of these conditions. Whatever you
set this option to, anything that stops travel will also stop
explore. Multiple explore_stop lines are cumulative if you use
diff --git a/crawl-ref/source/initfile.cc b/crawl-ref/source/initfile.cc
index 0c423a8ab4..69496fda15 100644
--- a/crawl-ref/source/initfile.cc
+++ b/crawl-ref/source/initfile.cc
@@ -748,8 +748,8 @@ void game_options::reset_options()
stash_tracking = STM_ALL;
- explore_stop = ES_ITEM | ES_STAIR | ES_PORTAL | ES_SHOP | ES_ALTAR
- | ES_GREEDY_PICKUP;
+ explore_stop = ES_ITEM | ES_STAIR | ES_PORTAL | ES_SHOP
+ | ES_ALTAR;
// The prompt conditions will be combined into explore_stop after
// reading options.