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
@@ -25,3 +25,3 @@
 
-CardDeck::CardDeck(int jokers) : numberOfJokers(jokers), deckCreated(FALSE)
+CardDeck::CardDeck(int jokers, int numOfDecks) : numberOfJokers(jokers), numberOfDecks(numOfDecks), deckCreated(FALSE)
 {
@@ -42,6 +42,10 @@ void CardDeck::createDeck()
     if (!deckCreated) {
-        for (int i = 0; i < 52; i++)
-            cards[i] = newCard( (eValue)((i % 13) + 1), (eSuit)((i / 13) + 1), FALSE );
+        for (int j = 0; j < getNumberOfDecks(); j++) {
+            for (int i = 0; i < 52; i++) {
+                cards[i+j*52] = newCard( (eValue)((i % 13) + 1), (eSuit)((i / 13) + 1), FALSE);
+                cards[i+j*52]->setDeckNumber(j);
+            }
+        }
         for (int i = 0; i < getNumberOfJokers(); i++)
-            cards[52 + i] = newCard( jokerVal, jokerSuit, FALSE );
+            cards[52*getNumberOfDecks() + i] = newCard( jokerVal, jokerSuit, FALSE);
         deckCreated = TRUE;
@@ -65,3 +69,9 @@ int CardDeck::getNumberOfCards()
 {
-    return 52 + getNumberOfJokers();
+    return 52*getNumberOfDecks() + getNumberOfJokers();
+}
+
+
+int CardDeck::getNumberOfDecks()
+{
+    return numberOfDecks;
 }