summaryrefslogtreecommitdiffstats
path: root/crawl-ref/source/decks.cc
diff options
context:
space:
mode:
authorharanp <haranp@c06c8d41-db1a-0410-9941-cceddc491573>2007-06-23 14:21:09 +0000
committerharanp <haranp@c06c8d41-db1a-0410-9941-cceddc491573>2007-06-23 14:21:09 +0000
commitdf39d45725b62feba8dbc81496902161ddb9f3ef (patch)
treed1b50d84c8852c7e0af92cee6c2ac53bbbbbc6c6 /crawl-ref/source/decks.cc
parentf6859509007cd7fbc7b744dd74c319456acf2a48 (diff)
downloadcrawl-ref-df39d45725b62feba8dbc81496902161ddb9f3ef.tar.gz
crawl-ref-df39d45725b62feba8dbc81496902161ddb9f3ef.zip
Lots of things which used to be members (invis, conf, confusing_touch, etc.)
are now durations. Removed some unnecessary limitations. git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@1626 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/decks.cc')
-rw-r--r--crawl-ref/source/decks.cc7
1 files changed, 6 insertions, 1 deletions
diff --git a/crawl-ref/source/decks.cc b/crawl-ref/source/decks.cc
index 1c2a8c5205..814736c9a3 100644
--- a/crawl-ref/source/decks.cc
+++ b/crawl-ref/source/decks.cc
@@ -877,7 +877,7 @@ static void trowel_card(int power, deck_rarity_type rarity)
static void genie_card(int power, deck_rarity_type rarity)
{
if ( coinflip() )
- acquirement( OBJ_RANDOM, AQ_CARD_ACQUISITION );
+ acquirement( OBJ_RANDOM, AQ_CARD_GENIE );
else
potion_effect( coinflip() ? POT_DEGENERATION : POT_DECAY, 40 );
}
@@ -953,6 +953,11 @@ static int card_power(deck_rarity_type rarity)
void card_effect(card_type which_card, deck_rarity_type rarity)
{
const int power = card_power(rarity);
+#ifdef DEBUG_DIAGNOSTICS
+ msg::streams(MSGCH_DIAGNOSTICS) << "Card power: " << power
+ << ", rarity: " << static_cast<int>(rarity)
+ << std::endl;
+#endif
msg::stream << "You have drawn " << card_name( which_card )
<< '.' << std::endl;