diff options
| author | Shmuale Mark <shm.mark@gmail.com> | 2014-05-11 01:57:42 -0400 |
|---|---|---|
| committer | Shmuale Mark <shm.mark@gmail.com> | 2014-05-28 11:01:26 -0400 |
| commit | 7f216ff0641accec50e60ab92ad490b8b742c0fb (patch) | |
| tree | ea40fda361e9b3d9f039b6b0aa4477a8b8701cee /crawl-ref/source/initfile.cc | |
| parent | 40715cc413a9ef3456fe1ca1356172a24a045c20 (diff) | |
| download | crawl-ref-7f216ff0641accec50e60ab92ad490b8b742c0fb.tar.gz crawl-ref-7f216ff0641accec50e60ab92ad490b8b742c0fb.zip | |
Remove the now-superfluous friendly_pickup command suite.
Including the default_friendly_pickup option.
Diffstat (limited to 'crawl-ref/source/initfile.cc')
| -rw-r--r-- | crawl-ref/source/initfile.cc | 12 |
1 files changed, 0 insertions, 12 deletions
diff --git a/crawl-ref/source/initfile.cc b/crawl-ref/source/initfile.cc index db47f66831..5914d78344 100644 --- a/crawl-ref/source/initfile.cc +++ b/crawl-ref/source/initfile.cc @@ -774,7 +774,6 @@ void game_options::reset_options() autopickup_on = 1; autopickup_starting_ammo = true; - default_friendly_pickup = FRIENDLY_PICKUP_FRIEND; default_manual_training = false; show_newturn_mark = true; @@ -2407,17 +2406,6 @@ void game_options::read_option_line(const string &str, bool runscript) autopickup_on = 0; } else BOOL_OPTION(autopickup_starting_ammo); - else if (key == "default_friendly_pickup") - { - if (field == "none") - default_friendly_pickup = FRIENDLY_PICKUP_NONE; - else if (field == "friend") - default_friendly_pickup = FRIENDLY_PICKUP_FRIEND; - else if (field == "player") - default_friendly_pickup = FRIENDLY_PICKUP_PLAYER; - else if (field == "all") - default_friendly_pickup = FRIENDLY_PICKUP_ALL; - } else if (key == "default_manual_training") { if (_read_bool(field, true)) |