diff options
| -rw-r--r-- | crawl-ref/source/delay.cc | 8 | ||||
| -rw-r--r-- | crawl-ref/source/initfile.cc | 5 |
2 files changed, 6 insertions, 7 deletions
diff --git a/crawl-ref/source/delay.cc b/crawl-ref/source/delay.cc index 204d10f488..be0673e69d 100644 --- a/crawl-ref/source/delay.cc +++ b/crawl-ref/source/delay.cc @@ -359,11 +359,9 @@ void handle_delay( void ) switch (delay.type) { case DELAY_AUTOPICKUP: - // Ask the player if they want to stop explore to examine - // the loot, but only if we picked up at least one item - // that the character did not throw. - int estop = (you.running == RMODE_EXPLORE_GREEDY - && delay.parm1)? ES_GREEDY_PICKUP : ES_PICKUP; + const int estop = + you.running == RMODE_EXPLORE_GREEDY? + ES_GREEDY_PICKUP : ES_PICKUP; if ((Options.explore_stop & estop) && prompt_stop_explore(estop)) stop_delay(); break; diff --git a/crawl-ref/source/initfile.cc b/crawl-ref/source/initfile.cc index 19fbf8cae9..c87f7265be 100644 --- a/crawl-ref/source/initfile.cc +++ b/crawl-ref/source/initfile.cc @@ -623,11 +623,12 @@ void game_options::reset_options() stash_tracking = STM_ALL; - explore_stop = ES_ITEM | ES_STAIR | ES_SHOP | ES_ALTAR; + explore_stop = ES_ITEM | ES_STAIR | ES_SHOP | ES_ALTAR + | ES_GREEDY_PICKUP; // The prompt conditions will be combined into explore_stop after // reading options. - explore_stop_prompt = ES_GREEDY_PICKUP; + explore_stop_prompt = ES_NONE; safe_zero_exp = true; target_zero_exp = false; |