diff options
| author | dolorous <dolorous@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-06-14 18:45:23 +0000 |
|---|---|---|
| committer | dolorous <dolorous@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-06-14 18:45:23 +0000 |
| commit | dac70786ba4b5bb25196a32b8973e359f2c96e3a (patch) | |
| tree | eab2776236849bddcb90c1cfb6c825d832763818 /crawl-ref/source/acr.cc | |
| parent | 43a8fc267d6386d366c600b24e30ec6937aa0b0b (diff) | |
| download | crawl-ref-dac70786ba4b5bb25196a32b8973e359f2c96e3a.tar.gz crawl-ref-dac70786ba4b5bb25196a32b8973e359f2c96e3a.zip | |
Consolidate the checks for gods that give you permanent followers into a
function, and have it take the other good gods into account, since, if
you switch from TSO to another good god, you keep all your non-daeva
permanent followers.
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@5821 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/acr.cc')
| -rw-r--r-- | crawl-ref/source/acr.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/crawl-ref/source/acr.cc b/crawl-ref/source/acr.cc index d7384a03d0..3609636e6a 100644 --- a/crawl-ref/source/acr.cc +++ b/crawl-ref/source/acr.cc @@ -1952,7 +1952,7 @@ void process_command( command_type cmd ) case CMD_TOGGLE_FRIENDLY_PICKUP: { - if (you.religion != GOD_SHINING_ONE && you.religion != GOD_BEOGH) + if (!god_gives_permanent_followers(you.religion)) { mpr("I'm sorry, your allies won't ever be able to pick up items."); if (Options.tutorial_left) @@ -4061,7 +4061,7 @@ static bool _initialise(void) if (newc) // start a new game { you.friendly_pickup = FRIENDLY_PICKUP_NONE; - if (you.religion == GOD_BEOGH || you.religion == GOD_SHINING_ONE) + if (god_gives_permanent_followers(you.religion)) you.friendly_pickup = Options.default_friendly_pickup; // Mark items in inventory as of unknown origin. |