diff options
author | j-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-12-08 20:15:03 +0000 |
---|---|---|
committer | j-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-12-08 20:15:03 +0000 |
commit | 8cbb227becdc172839b901aedf972022dc73118d (patch) | |
tree | 0bd26e8356d53ebe455ae21bdc391e7adb79beb9 /crawl-ref/source/decks.cc | |
parent | 504342b26a04cf2e33cb49b61d721ee483f5c68b (diff) | |
download | crawl-ref-8cbb227becdc172839b901aedf972022dc73118d.tar.gz crawl-ref-8cbb227becdc172839b901aedf972022dc73118d.zip |
Apply a bunch of trunk commits, mostly by Haran, namely:
6766 (partly), 6834 (partly), 6867, 6892, 6903, 6906, 6908, 6909,
6927, 6928, 6929, 6943, 6945, 6946
* Message/description tweaks.
* Fix enchanting hides not updating AC.
* Fix incorrect score calculation.
* All 't' commands now take a turn.
* Don't prompt when swapping into dangerous terrain.
* Fix backwards stealth check.
* Fix off-by-1 error when selecting starting weapon.
* Lichform discards holy wrath weapons.
* Reinitialise zap counter for recharged wands, mention charges.
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/branches/stone_soup-0.4@7786 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/decks.cc')
-rw-r--r-- | crawl-ref/source/decks.cc | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/crawl-ref/source/decks.cc b/crawl-ref/source/decks.cc index 35ecee1e58..fdcf348bf8 100644 --- a/crawl-ref/source/decks.cc +++ b/crawl-ref/source/decks.cc @@ -1064,6 +1064,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. |