Changed interrupted butchering behaviour as per Johanna's

suggestions/observations:

1) Get rid of option swap_when_safe and its behaviour.

2) If auto-swap butchery is interrupted by teleportation or chagning levels
   (banishment) then auto-swap back if there's no monsters nearby.

2b) Do the same if butchery is interrupted and then later a large position
    change happens.

3) If auto-swap butchery is interrupted by something like poison damage,
   if the butchery is resumed and finished then swap back.

4) If auto-swap butchery is interrupted by a monster, then if the
   new option prompt_for_swap is set the game will ask if you wish to
   swap back from your butchering tool.

4b) Do the same if butchery is interrupted and then later a large
    position change lands you near some hostile monsters.


git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@7717 c06c8d41-db1a-0410-9941-cceddc491573

1 files changed, 2 insertions, 2 deletions

diff --git a/crawl-ref/source/initfile.cc b/crawl-ref/source/initfile.cc
index d256558f1d..5763bdc482 100644
--- a/crawl-ref/source/initfile.cc
+++ b/crawl-ref/source/initfile.cc
@@ -682,7 +682,7 @@ void game_options::reset_options()
     easy_butcher           = true;
     always_confirm_butcher = false;
     chunks_autopickup      = true;
-    swap_when_safe         = true;
+    prompt_for_swap        = true;
     list_rotten            = true;
     easy_confirm           = CONFIRM_SAFE_EASY;
     easy_quit_item_prompts = true;
@@ -2054,7 +2054,7 @@ void game_options::read_option_line(const std::string &str, bool runscript)
     else BOOL_OPTION(easy_butcher);
     else BOOL_OPTION(always_confirm_butcher);
     else BOOL_OPTION(chunks_autopickup);
-    else BOOL_OPTION(swap_when_safe);
+    else BOOL_OPTION(prompt_for_swap);
     else BOOL_OPTION(list_rotten);
     else if (key == "lua_file" && runscript)
     {