diff options
author | Matthew Cline <zelgadis@sourceforge.net> | 2009-11-17 20:27:30 -0800 |
---|---|---|
committer | Matthew Cline <zelgadis@sourceforge.net> | 2009-11-17 20:28:01 -0800 |
commit | ba8b21466165fb27981860c3c6ffcf468763d9ea (patch) | |
tree | 3e336db72955f5f77680c36378d95493a19589b5 /crawl-ref | |
parent | 1d3bc0d683b360a293d4c308fcbc3a1176103451 (diff) | |
download | crawl-ref-ba8b21466165fb27981860c3c6ffcf468763d9ea.tar.gz crawl-ref-ba8b21466165fb27981860c3c6ffcf468763d9ea.zip |
Revert to stop auto-explore on greedy-pickup
Diffstat (limited to 'crawl-ref')
-rw-r--r-- | crawl-ref/docs/options_guide.txt | 2 | ||||
-rw-r--r-- | crawl-ref/source/initfile.cc | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/crawl-ref/docs/options_guide.txt b/crawl-ref/docs/options_guide.txt index c8d4667aab..2d4d1d3d30 100644 --- a/crawl-ref/docs/options_guide.txt +++ b/crawl-ref/docs/options_guide.txt @@ -825,7 +825,7 @@ explore_greedy = true you're temporarily unable to pick up items (from uncontrolled levitation, for instance). -explore_stop = items,stairs,shops,altars,gates +explore_stop = items,greed_pickup,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 ee72fc3cbd..37dfd8f952 100644 --- a/crawl-ref/source/initfile.cc +++ b/crawl-ref/source/initfile.cc @@ -749,7 +749,7 @@ void game_options::reset_options() stash_tracking = STM_ALL; explore_stop = ES_ITEM | ES_STAIR | ES_PORTAL | ES_SHOP - | ES_ALTAR; + | ES_ALTAR | ES_GREEDY_PICKUP; // The prompt conditions will be combined into explore_stop after // reading options. |