1 files changed, 16 insertions, 6 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
@@ -14,68 +14,78 @@
 ** See http://www.trolltech.com/gpl/ for GPL licensing information.
 **
 ** Contact info@trolltech.com if any conditions of this licensing are
 ** not clear to you.
 **
 **********************************************************************/
 #include <stdlib.h>
 #include <time.h>
 #include "card.h"
 #include "carddeck.h"
 
 
-CardDeck::CardDeck(int jokers) : numberOfJokers(jokers), deckCreated(FALSE)
+CardDeck::CardDeck(int jokers, int numOfDecks) : numberOfJokers(jokers), numberOfDecks(numOfDecks), deckCreated(FALSE)
 {
     cards = new (Card *)[getNumberOfCards()];
 }
 
 
 CardDeck::~CardDeck()
 {
     for (int i = 0; i < getNumberOfCards(); i++)
         delete cards[i];
     delete cards;
 }
 
 
 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;
     }
 }
 
 
 void CardDeck::shuffle()
 {
     srand(time(NULL));
     for (int i = 0; i < getNumberOfCards(); i++) {
         int index = rand() % getNumberOfCards();
         Card *tmpCard = cards[i];
         cards[i] = cards[index];
         cards[index] = tmpCard;
     }
 }
 
 
 int CardDeck::getNumberOfCards()
 {
-    return 52 + getNumberOfJokers();
+    return 52*getNumberOfDecks() + getNumberOfJokers();
 }
 
 
+int CardDeck::getNumberOfDecks()
+{
+    return numberOfDecks;
+}
+    
+
 int CardDeck::getNumberOfJokers()
 {
     return numberOfJokers;
 }
     
 
-Card *CardDeck::newCard( eValue v, eSuit s, bool f )
+Card *CardDeck::newCard( eValue v, eSuit s, bool f)
 {
     return new Card(v, s, f);
 }