summaryrefslogtreecommitdiffstats
path: root/crawl-ref
diff options
context:
space:
mode:
authordolorous <dolorous@c06c8d41-db1a-0410-9941-cceddc491573>2009-07-28 02:02:14 +0000
committerdolorous <dolorous@c06c8d41-db1a-0410-9941-cceddc491573>2009-07-28 02:02:14 +0000
commitae187c5a9666e8a87dfdad5ae6ef9cc586b159e4 (patch)
tree4a44fe3f6bac2222b30db36b2fb1f5928147f3af /crawl-ref
parent561bada1e5f32af11f7ebc6caf4c5dfe0c27f73f (diff)
downloadcrawl-ref-ae187c5a9666e8a87dfdad5ae6ef9cc586b159e4.tar.gz
crawl-ref-ae187c5a9666e8a87dfdad5ae6ef9cc586b159e4.zip
Add minor cosmetic fixes.
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@10438 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref')
-rw-r--r--crawl-ref/source/decks.cc7
1 files changed, 5 insertions, 2 deletions
diff --git a/crawl-ref/source/decks.cc b/crawl-ref/source/decks.cc
index 3636d4ce57..588a5210d6 100644
--- a/crawl-ref/source/decks.cc
+++ b/crawl-ref/source/decks.cc
@@ -2606,9 +2606,7 @@ static void _curse_card(int power, deck_rarity_type rarity)
{
// Curse an average of four items.
do
- {
curse_an_item(false);
- }
while (!one_chance_in(4));
}
else
@@ -2661,7 +2659,12 @@ static void _crusade_card(int power, deck_rarity_type rarity)
&& !mons_is_summoned(monster)
&& !mons_is_shapeshifter(monster))
{
+ // Prevent assertion if the monster was
+ // previously worshipping a different god,
+ // rather than already worshipping your god or
+ // being an atheist.
monster->god = GOD_NO_GOD;
+
mons_make_god_gift(monster, is_good_god(you.religion) ?
GOD_SHINING_ONE : GOD_BEOGH);
}