summaryrefslogtreecommitdiffstats
path: root/crawl-ref/source/initfile.cc
diff options
context:
space:
mode:
Diffstat (limited to 'crawl-ref/source/initfile.cc')
-rw-r--r--crawl-ref/source/initfile.cc10
1 files changed, 5 insertions, 5 deletions
diff --git a/crawl-ref/source/initfile.cc b/crawl-ref/source/initfile.cc
index bc14c9545f..d2e44d7d14 100644
--- a/crawl-ref/source/initfile.cc
+++ b/crawl-ref/source/initfile.cc
@@ -628,7 +628,7 @@ void game_options::reset_options()
autopickup_on = true;
autoprayer_on = false;
- default_friendly_pickup = 0; // allies may only pickup items
+ default_friendly_pickup = FRIENDLY_PICKUP_FRIEND;
show_more_prompt = true;
show_gold_turns = false;
@@ -1805,11 +1805,11 @@ void game_options::read_option_line(const std::string &str, bool runscript)
else if (key == "default_friendly_pickup")
{
if (field == "none")
- default_friendly_pickup = -1;
- else if (field == "all")
- default_friendly_pickup = 1;
+ default_friendly_pickup = FRIENDLY_PICKUP_NONE;
else if (field == "friend")
- default_friendly_pickup = 0;
+ default_friendly_pickup = FRIENDLY_PICKUP_FRIEND;
+ else if (field == "all")
+ default_friendly_pickup = FRIENDLY_PICKUP_ALL;
}
else BOOL_OPTION(show_inventory_weights);
else BOOL_OPTION(suppress_startup_errors);