2 files changed, 14 insertions, 8 deletions

diff --git a/noncore/games/solitaire/patiencecardgame.cpp b/noncore/games/solitaire/patiencecardgame.cpp
index 756577a..a1e4968 100644
--- a/noncore/games/solitaire/patiencecardgame.cpp
+++ b/noncore/games/solitaire/patiencecardgame.cpp
@@ -96,51 +96,51 @@ void PatienceCardGame::deal(void)
             card->showCard();
             highestZ++;
         }
     }
 
     for ( ; t < 52; t++)
     {
         Card *card = cards[t];
         faceDownDealingPile->addCardToTop(card);
         card->setCardPile( faceDownDealingPile );
         QPoint p = faceDownDealingPile->getCardPos( card );
         card->setPos( p.x(), p.y(), highestZ );
         card->showCard();
         highestZ++;
     }
 
     endDealing();
 }
 
 
 void PatienceCardGame::readConfig( Config& cfg )
 {
     cfg.setGroup("GameState");
 
+        deckTurns = cfg.readNumEntry("DeckTurns", 2500);
     // Do we have a config file to read in?
-    if ( !cfg.hasKey("numberOfTimesThroughDeck") )
-    {
+    if ( !cfg.hasKey("numberOfTimesThroughDeck") ) {
         // if not, create a new game
         newGame();
         return;
     }
     // We have a config file, lets read it in and use it
 
     // Create Cards, but don't shuffle or deal them yet
     createDeck();
 
     // How many times through the deck have we been
     numberOfTimesThroughDeck = cfg.readNumEntry("numberOfTimesThroughDeck");
 
     // restore state to the circle/cross under the dealing pile
     if ( canTurnOverDeck() )
         circleCross->setCircle();
     else
         circleCross->setCross();
 
     // Move the cards to their piles (deal them to their previous places)
     beginDealing();
 
     highestZ = 1;
 
     for (int k = 0; k < 7; k++)
@@ -256,24 +256,33 @@ void PatienceCardGame::mousePress(QPoint p)
             (p.y() > 10) && (p.y() < 46) )
     {
 
         beginDealing();
         Card *card = faceUpDealingPile->cardOnTop();
         while ( card )
         {
             card->setPos( 5, 10, highestZ );
             card->setFace( FALSE );
             faceUpDealingPile->removeCard( card );
             faceDownDealingPile->addCardToTop( card );
             card->setCardPile( faceDownDealingPile );
             card = faceUpDealingPile->cardOnTop();
             highestZ++;
         }
         endDealing();
 
         throughDeck();
 
         moved = TRUE;
     }
 }
 
 
+bool PatienceCardGame::canTurnOverDeck() {
+        return (numberOfTimesThroughDeck != deckTurns);
+}
+
+void PatienceCardGame::throughDeck() {
+        numberOfTimesThroughDeck++;
+        if (numberOfTimesThroughDeck == deckTurns)
+                circleCross->setCross();
+ }
diff --git a/noncore/games/solitaire/patiencecardgame.h b/noncore/games/solitaire/patiencecardgame.h
index 0d0e3d5..b76251a 100644
--- a/noncore/games/solitaire/patiencecardgame.h
+++ b/noncore/games/solitaire/patiencecardgame.h
@@ -152,58 +152,55 @@ public:
             } else {
                 x += 1;    
                 y += 3;
             }
             card = cardInfront(card); 
         }
         return QPoint( x, y );
     }
     virtual QPoint getHypertheticalNextCardPos(void) {
         return top;
         // return QPoint( getNextX(), getNextY() );
     }
 private:
     QPoint top;
 
 };
 
 
 class PatienceCardGame : public CanvasCardGame
 {
 public:
     PatienceCardGame(QCanvas *c, bool snap, QWidget *parent = 0);
     virtual ~PatienceCardGame();
     virtual void deal(void);
+        int deckTurns;
     virtual bool haveWeWon() { 
         return ( discardPiles[0]->kingOnTop() &&
                  discardPiles[1]->kingOnTop() &&
                  discardPiles[2]->kingOnTop() &&
                  discardPiles[3]->kingOnTop() );;
     }
     virtual void mousePress(QPoint p);
     virtual void mouseRelease(QPoint p) { Q_UNUSED(p); }
 //    virtual void mouseMove(QPoint p);
     virtual bool mousePressCard(Card *card, QPoint p);
     virtual void mouseReleaseCard(Card *card, QPoint p) { Q_UNUSED(card); Q_UNUSED(p); }
 //    virtual void mouseMoveCard(Card *card, QPoint p) { Q_UNUSED(card); Q_UNUSED(p); }
-    bool canTurnOverDeck(void) { return (numberOfTimesThroughDeck != 3); }
-    void throughDeck(void) {
-        numberOfTimesThroughDeck++;
-        if (numberOfTimesThroughDeck == 3)
-                circleCross->setCross();
-    }
+    bool canTurnOverDeck();
+    void throughDeck();
     bool snapOn;
     virtual void writeConfig( Config& cfg );
     virtual void readConfig( Config& cfg );
 private:
     CanvasCircleOrCross *circleCross;
     CanvasRoundRect *rectangle;
     PatienceWorkingPile *workingPiles[7];
     PatienceDiscardPile *discardPiles[4];
     PatienceFaceDownDeck *faceDownDealingPile;
     PatienceFaceUpDeck *faceUpDealingPile;
     int numberOfTimesThroughDeck;
 };
 
 
 #endif