summaryrefslogtreecommitdiffstats
path: root/crawl-ref/source/religion.cc
diff options
context:
space:
mode:
authordolorous <dolorous@c06c8d41-db1a-0410-9941-cceddc491573>2008-11-04 20:38:11 +0000
committerdolorous <dolorous@c06c8d41-db1a-0410-9941-cceddc491573>2008-11-04 20:38:11 +0000
commit7c805921b8b0847c39c20ed508c0d8e6b76ae55a (patch)
tree280544bc8a6e645e56ddd8bf068b90204d7fca39 /crawl-ref/source/religion.cc
parentf15f0492a0e0f2ef2a20ebf711edb557562f5851 (diff)
downloadcrawl-ref-7c805921b8b0847c39c20ed508c0d8e6b76ae55a.tar.gz
crawl-ref-7c805921b8b0847c39c20ed508c0d8e6b76ae55a.zip
Simplify, based on the fact that there are no non-evil priestly
monsters, so TSOites will have none for allies. git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@7386 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/religion.cc')
-rw-r--r--crawl-ref/source/religion.cc12
1 files changed, 5 insertions, 7 deletions
diff --git a/crawl-ref/source/religion.cc b/crawl-ref/source/religion.cc
index 515aa455d6..c91946cd2f 100644
--- a/crawl-ref/source/religion.cc
+++ b/crawl-ref/source/religion.cc
@@ -1555,10 +1555,9 @@ bool bless_follower(monsters *follower,
if (chance > 2)
return (false);
- // Choose a random follower in LOS, preferably a named one, or
- // preferably a priestly one for Beogh (10% chance).
- follower = choose_random_nearby_monster(0, suitable, true, true,
- god == GOD_BEOGH);
+ // Choose a random follower in LOS, preferably a named or
+ // priestly one (10% chance).
+ follower = choose_random_nearby_monster(0, suitable, true, true, true);
if (!follower)
{
@@ -1567,7 +1566,7 @@ bool bless_follower(monsters *follower,
// Try again, without the LOS restriction (5% chance).
follower = choose_random_nearby_monster(0, suitable, false, true,
- god == GOD_BEOGH);
+ true);
if (!follower)
{
@@ -1576,8 +1575,7 @@ bool bless_follower(monsters *follower,
// Try *again*, on the entire level (2.5% chance).
follower = choose_random_monster_on_level(0, suitable, false,
- false, true,
- god == GOD_BEOGH);
+ false, true, true);
if (!follower)
{