summaryrefslogtreecommitdiffstats
path: root/crawl-ref/source/initfile.cc
diff options
context:
space:
mode:
authorj-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573>2009-03-12 20:12:49 +0000
committerj-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573>2009-03-12 20:12:49 +0000
commiteaa52e83a89d49475ee00812ebcf0fe7caa89980 (patch)
tree5e5a72fe1927d96c111fddee0a0cf42109ac076a /crawl-ref/source/initfile.cc
parentb7559dcd3bb981a5eba189eb732fb7eca60d5f70 (diff)
downloadcrawl-ref-eaa52e83a89d49475ee00812ebcf0fe7caa89980.tar.gz
crawl-ref-eaa52e83a89d49475ee00812ebcf0fe7caa89980.zip
FR 2093461: add player + allies FRIENDLY_PICKUP mode
Make Roxanne immune to disintegration (like ice statues). Move rock worms a bit lower in the dungeon and increase their damage (a tiny bit). git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@9428 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/initfile.cc')
-rw-r--r--crawl-ref/source/initfile.cc2
1 files changed, 2 insertions, 0 deletions
diff --git a/crawl-ref/source/initfile.cc b/crawl-ref/source/initfile.cc
index 4bee7a894b..dc2ce6daaa 100644
--- a/crawl-ref/source/initfile.cc
+++ b/crawl-ref/source/initfile.cc
@@ -2107,6 +2107,8 @@ void game_options::read_option_line(const std::string &str, bool runscript)
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;
}