summaryrefslogtreecommitdiffstats
path: root/crawl-ref/source/misc.cc
diff options
context:
space:
mode:
authordolorous <dolorous@c06c8d41-db1a-0410-9941-cceddc491573>2008-06-14 18:45:23 +0000
committerdolorous <dolorous@c06c8d41-db1a-0410-9941-cceddc491573>2008-06-14 18:45:23 +0000
commitdac70786ba4b5bb25196a32b8973e359f2c96e3a (patch)
treeeab2776236849bddcb90c1cfb6c825d832763818 /crawl-ref/source/misc.cc
parent43a8fc267d6386d366c600b24e30ec6937aa0b0b (diff)
downloadcrawl-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/misc.cc')
-rw-r--r--crawl-ref/source/misc.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/crawl-ref/source/misc.cc b/crawl-ref/source/misc.cc
index f77d6cb54f..59f4ef04d8 100644
--- a/crawl-ref/source/misc.cc
+++ b/crawl-ref/source/misc.cc
@@ -2057,7 +2057,7 @@ void down_stairs( int old_level, dungeon_feature_type force_stair,
if (newlevel)
{
// When entering a new level, reset friendly_pickup to default.
- if (you.religion == GOD_BEOGH || you.religion == GOD_SHINING_ONE)
+ if (god_gives_permanent_followers(you.religion))
you.friendly_pickup = Options.default_friendly_pickup;
switch(you.level_type)