Diffstat (limited to 'noncore/games/solitaire/carddeck.cpp') (more/less context) (show whitespace changes)
-rw-r--r-- | noncore/games/solitaire/carddeck.cpp | 20 |
1 files changed, 15 insertions, 5 deletions
diff --git a/noncore/games/solitaire/carddeck.cpp b/noncore/games/solitaire/carddeck.cpp index 87c043a..a2d0076 100644 --- a/noncore/games/solitaire/carddeck.cpp +++ b/noncore/games/solitaire/carddeck.cpp | |||
@@ -23,7 +23,7 @@ | |||
23 | #include "carddeck.h" | 23 | #include "carddeck.h" |
24 | 24 | ||
25 | 25 | ||
26 | CardDeck::CardDeck(int jokers) : numberOfJokers(jokers), deckCreated(FALSE) | 26 | CardDeck::CardDeck(int jokers, int numOfDecks) : numberOfJokers(jokers), numberOfDecks(numOfDecks), deckCreated(FALSE) |
27 | { | 27 | { |
28 | cards = new (Card *)[getNumberOfCards()]; | 28 | cards = new (Card *)[getNumberOfCards()]; |
29 | } | 29 | } |
@@ -40,10 +40,14 @@ CardDeck::~CardDeck() | |||
40 | void CardDeck::createDeck() | 40 | void CardDeck::createDeck() |
41 | { | 41 | { |
42 | if (!deckCreated) { | 42 | if (!deckCreated) { |
43 | for (int i = 0; i < 52; i++) | 43 | for (int j = 0; j < getNumberOfDecks(); j++) { |
44 | cards[i] = newCard( (eValue)((i % 13) + 1), (eSuit)((i / 13) + 1), FALSE ); | 44 | for (int i = 0; i < 52; i++) { |
45 | cards[i+j*52] = newCard( (eValue)((i % 13) + 1), (eSuit)((i / 13) + 1), FALSE); | ||
46 | cards[i+j*52]->setDeckNumber(j); | ||
47 | } | ||
48 | } | ||
45 | for (int i = 0; i < getNumberOfJokers(); i++) | 49 | for (int i = 0; i < getNumberOfJokers(); i++) |
46 | cards[52 + i] = newCard( jokerVal, jokerSuit, FALSE ); | 50 | cards[52*getNumberOfDecks() + i] = newCard( jokerVal, jokerSuit, FALSE); |
47 | deckCreated = TRUE; | 51 | deckCreated = TRUE; |
48 | } | 52 | } |
49 | } | 53 | } |
@@ -63,7 +67,13 @@ void CardDeck::shuffle() | |||
63 | 67 | ||
64 | int CardDeck::getNumberOfCards() | 68 | int CardDeck::getNumberOfCards() |
65 | { | 69 | { |
66 | return 52 + getNumberOfJokers(); | 70 | return 52*getNumberOfDecks() + getNumberOfJokers(); |
71 | } | ||
72 | |||
73 | |||
74 | int CardDeck::getNumberOfDecks() | ||
75 | { | ||
76 | return numberOfDecks; | ||
67 | } | 77 | } |
68 | 78 | ||
69 | 79 | ||