summaryrefslogtreecommitdiffstats
path: root/crawl-ref/source/decks.cc
diff options
context:
space:
mode:
authordolorous <dolorous@c06c8d41-db1a-0410-9941-cceddc491573>2008-10-14 06:57:29 +0000
committerdolorous <dolorous@c06c8d41-db1a-0410-9941-cceddc491573>2008-10-14 06:57:29 +0000
commite6382da066816a596525d3f62d49aa7c9bba45ce (patch)
treed3c0348fcf2b2350ee34b0939481bd6b06dd391b /crawl-ref/source/decks.cc
parentb0726dc32d2f89a6b5cbc5d4a6d2f59e1961b051 (diff)
downloadcrawl-ref-e6382da066816a596525d3f62d49aa7c9bba45ce.tar.gz
crawl-ref-e6382da066816a596525d3f62d49aa7c9bba45ce.zip
Consistency fixes: Ensure that Beoghits can't permanently recruit
summoned orcs via the Crusade card, or beat shapeshifters in orc form into submission. git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@7246 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/decks.cc')
-rw-r--r--crawl-ref/source/decks.cc1
1 files changed, 1 insertions, 0 deletions
diff --git a/crawl-ref/source/decks.cc b/crawl-ref/source/decks.cc
index d4c41758c8..cf02cfa371 100644
--- a/crawl-ref/source/decks.cc
+++ b/crawl-ref/source/decks.cc
@@ -2493,6 +2493,7 @@ static void _crusade_card(int power, deck_rarity_type rarity)
if (is_good_god(you.religion)
|| you.religion == GOD_BEOGH
&& mons_species(monster->type) == MONS_ORC
+ && !mons_is_summoned(monster)
&& !mons_is_shapeshifter(monster))
{
mons_make_god_gift(monster, is_good_god(you.religion) ?