summaryrefslogtreecommitdiffstats
path: root/crawl-ref/source/initfile.cc
diff options
context:
space:
mode:
authorzelgadis <zelgadis@c06c8d41-db1a-0410-9941-cceddc491573>2008-12-02 07:59:12 +0000
committerzelgadis <zelgadis@c06c8d41-db1a-0410-9941-cceddc491573>2008-12-02 07:59:12 +0000
commit07eadf8e4cf3dd61fa66d194720143685ab84174 (patch)
tree60ca13a09c47d9c6a7b0d871bac374f057134e85 /crawl-ref/source/initfile.cc
parentd03bcac5636625a61db20500a51418227316b34b (diff)
downloadcrawl-ref-07eadf8e4cf3dd61fa66d194720143685ab84174.tar.gz
crawl-ref-07eadf8e4cf3dd61fa66d194720143685ab84174.zip
Merge r7717 and r7718: improvements to interrupted butchery behaviour.
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/branches/stone_soup-0.4@7719 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/initfile.cc')
-rw-r--r--crawl-ref/source/initfile.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/crawl-ref/source/initfile.cc b/crawl-ref/source/initfile.cc
index b589964586..4db8cb975e 100644
--- a/crawl-ref/source/initfile.cc
+++ b/crawl-ref/source/initfile.cc
@@ -687,7 +687,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;
@@ -2039,7 +2039,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)
{