2 files changed, 25 insertions, 19 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
@@ -116,11 +116,11 @@ void PatienceCardGame::deal(void)
 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;
     }
@@ -276,4 +276,13 @@ void PatienceCardGame::mousePress(QPoint p)
     }
 }
 
 
+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
@@ -17,9 +17,9 @@
 ** not clear to you.
 **
 **********************************************************************/
 #ifndef PATIENCE_CARD_GAME_H
-#define PATIENCE_CARD_GAME_H 
+#define PATIENCE_CARD_GAME_H
 
 
 #include <qpopupmenu.h>
 #include <qmainwindow.h>
@@ -45,9 +45,9 @@ public:
         Q_UNUSED(card);
         //if ( ( !card->isFacing() ) && ( card == cardOnTop() ) )
         if ( card == cardOnTop() )
             return TRUE;
-                return FALSE;
+        return FALSE;
     }
 };
 
 
@@ -65,9 +65,9 @@ public:
         Q_UNUSED(card);
         //if ( ( card->isFacing() ) && ( card == cardOnTop() ) )
         if ( card == cardOnTop() )
             return TRUE;
-                return FALSE;
+        return FALSE;
     }
 };
 
 
@@ -82,14 +82,14 @@ public:
              ( ( cardOnTop() != NULL ) &&
                ( (int)card->getValue() == (int)cardOnTop()->getValue() + 1 ) &&
                ( card->getSuit() == cardOnTop()->getSuit() ) ) ) )
             return TRUE;
-                return FALSE;
+        return FALSE;
     }
     virtual bool isAllowedToBeMoved(Card *card) {
         if ( card->isFacing() && ( card == cardOnTop() ) )
             return TRUE;
-                return FALSE;
+        return FALSE;
     }
 };
 
 
@@ -104,14 +104,14 @@ public:
                ( ( cardOnTop() != NULL ) &&
                   ( (int)card->getValue() + 1 == (int)cardOnTop()->getValue() ) &&
                  ( card->isRed() != cardOnTop()->isRed() ) ) ) )
             return TRUE;
-                return FALSE;
+        return FALSE;
     }
     virtual bool isAllowedToBeMoved(Card *card) {
         if ( card->isFacing() )
             return TRUE;
-                return FALSE;
+        return FALSE;
     }
     virtual void cardAddedToTop(Card *card) {
         Q_UNUSED(card);
         top = getCardPos(NULL);
@@ -147,14 +147,14 @@ public:
         Card *card = cardOnBottom();
         while ((card != c) && (card != NULL)) {
             if (card->isFacing()) {
                 int offsetDown = ( qt_screen->deviceWidth() < 200 ) ? 9 : 13;
-                y += offsetDown; 
+                y += offsetDown;
             } else {
-                x += 1;    
+                x += 1;
                 y += 3;
             }
-            card = cardInfront(card); 
+            card = cardInfront(card);
         }
         return QPoint( x, y );
     }
     virtual QPoint getHypertheticalNextCardPos(void) {
@@ -172,9 +172,10 @@ class PatienceCardGame : public CanvasCardGame
 public:
     PatienceCardGame(QCanvas *c, bool snap, QWidget *parent = 0);
     virtual ~PatienceCardGame();
     virtual void deal(void);
-    virtual bool haveWeWon() { 
+        int deckTurns;
+    virtual bool haveWeWon() {
         return ( discardPiles[0]->kingOnTop() &&
                  discardPiles[1]->kingOnTop() &&
                  discardPiles[2]->kingOnTop() &&
                  discardPiles[3]->kingOnTop() );;
@@ -184,14 +185,10 @@ public:
 //    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: