summaryrefslogtreecommitdiffstats
path: root/crawl-ref/source/decks.cc
diff options
context:
space:
mode:
authorEino Keskitalo <evktalo@users.sourceforge.net>2009-11-07 16:30:52 +0200
committerDavid Lawrence Ramsey <dolorous@users.sourceforge.net>2009-11-07 23:21:21 -0600
commit1c0a611a9e00fc789a8e71f1423e48bec7dd5020 (patch)
treeb73d3be502e13ec1bb56e89e5382fd14f71a74ba /crawl-ref/source/decks.cc
parentee4d8d69cdded564187651f879b618a4fc2538f9 (diff)
downloadcrawl-ref-1c0a611a9e00fc789a8e71f1423e48bec7dd5020.tar.gz
crawl-ref-1c0a611a9e00fc789a8e71f1423e48bec7dd5020.zip
Merge from chaotic_experiment branch:
Replace mons_is_shapeshifter(const monsters *m) in mon-util.cc with is_shapeshifter() in monster.cc
Diffstat (limited to 'crawl-ref/source/decks.cc')
-rw-r--r--crawl-ref/source/decks.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/crawl-ref/source/decks.cc b/crawl-ref/source/decks.cc
index 7f44093d9b..f5605b1615 100644
--- a/crawl-ref/source/decks.cc
+++ b/crawl-ref/source/decks.cc
@@ -2547,7 +2547,7 @@ static void _crusade_card(int power, deck_rarity_type rarity)
|| you.religion == GOD_BEOGH
&& mons_species(monster->type) == MONS_ORC
&& !monster->is_summoned()
- && !mons_is_shapeshifter(monster))
+ && !monster->is_shapeshifter())
{
// Prevent assertion if the monster was
// previously worshipping a different god,