diff options
| author | j-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-07-15 13:39:46 +0000 |
|---|---|---|
| committer | j-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-07-15 13:39:46 +0000 |
| commit | d976570ee5fbcc53481d76b2d55d389908968bd5 (patch) | |
| tree | 2d21214d5876063cb72ddd798dc2e8bd60d4645a /crawl-ref/source/religion.cc | |
| parent | 9732543e9f33ed367f108f7b00509f67e8e9db81 (diff) | |
| download | crawl-ref-d976570ee5fbcc53481d76b2d55d389908968bd5.tar.gz crawl-ref-d976570ee5fbcc53481d76b2d55d389908968bd5.zip | |
Apply commits r6556 and r6557 to 0.4.
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/branches/stone_soup-0.4@6558 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/religion.cc')
| -rw-r--r-- | crawl-ref/source/religion.cc | 15 |
1 files changed, 0 insertions, 15 deletions
diff --git a/crawl-ref/source/religion.cc b/crawl-ref/source/religion.cc index 46d6e633d1..8d7ba6d663 100644 --- a/crawl-ref/source/religion.cc +++ b/crawl-ref/source/religion.cc @@ -5493,21 +5493,6 @@ void god_pitch(god_type which_god) you.gift_timeout = 0; } - if (god_gives_permanent_followers(you.religion)) - { - // Enable ally pickup control for gods that give you permanent - // followers. - you.friendly_pickup = Options.default_friendly_pickup; - } - else - { - // With other gods, you can only get stupid (zombies!), - // summoned, or charmed allies, so pickup control makes no - // sense. Sorry about that! - you.friendly_pickup = FRIENDLY_PICKUP_NONE; - } - - set_god_ability_slots(); // remove old god's slots, reserve new god's #ifdef DGL_WHEREIS whereis_record(); |