diff options
| author | j-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-05-07 21:30:12 +0000 |
|---|---|---|
| committer | j-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-05-07 21:30:12 +0000 |
| commit | 88476ef9569929088137a21fcb4822ae7a83431a (patch) | |
| tree | 0d787ab237dd7e58fdecf051199721a803c072a6 /crawl-ref/source/initfile.cc | |
| parent | 100c7dd207a48003e0af4834d94244fbded71cf9 (diff) | |
| download | crawl-ref-88476ef9569929088137a21fcb4822ae7a83431a.tar.gz crawl-ref-88476ef9569929088137a21fcb4822ae7a83431a.zip | |
Properly save friendly pickup setting as a player variable (rather than
options). This increases the minor version by 1. Also, tidy up the
checks of this settings.
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@4916 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/initfile.cc')
| -rw-r--r-- | crawl-ref/source/initfile.cc | 10 |
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); |