summaryrefslogtreecommitdiffstats
path: root/crawl-ref/source/decks.cc
diff options
context:
space:
mode:
authorharanp <haranp@c06c8d41-db1a-0410-9941-cceddc491573>2008-09-12 00:50:04 +0000
committerharanp <haranp@c06c8d41-db1a-0410-9941-cceddc491573>2008-09-12 00:50:04 +0000
commit9cae2f059ad75fbfa4584e366aeda5c59d2807eb (patch)
tree0ae1ea3f707e133f7917d9015dd024ad0dfbe400 /crawl-ref/source/decks.cc
parent242e253a0150d3254dce8b3b6b634348925d55d7 (diff)
downloadcrawl-ref-9cae2f059ad75fbfa4584e366aeda5c59d2807eb.tar.gz
crawl-ref-9cae2f059ad75fbfa4584e366aeda5c59d2807eb.zip
Fix 2059408: wrong message when Triple Draw finishes an unidentified deck.
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@6906 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/decks.cc')
-rw-r--r--crawl-ref/source/decks.cc5
1 files changed, 5 insertions, 0 deletions
diff --git a/crawl-ref/source/decks.cc b/crawl-ref/source/decks.cc
index 012de36daf..dec9f69b8f 100644
--- a/crawl-ref/source/decks.cc
+++ b/crawl-ref/source/decks.cc
@@ -1065,6 +1065,11 @@ bool deck_triple_draw()
const int num_cards = cards_in_deck(deck);
+ // We have to identify the deck before removing cards from it.
+ // Otherwise, _remember_drawn_card() will implicitly call
+ // _deck_ident() when the deck might have no cards left.
+ _deck_ident(deck);
+
if (num_cards == 1)
{
// Only one card to draw, so just draw it.