- turn on casino rules in solitare (make it eventually configurable)

1 files changed, 15 insertions, 11 deletions

diff --git a/noncore/games/solitaire/patiencecardgame.cpp b/noncore/games/solitaire/patiencecardgame.cpp
index a1e4968..00448ad 100644
--- a/noncore/games/solitaire/patiencecardgame.cpp
+++ b/noncore/games/solitaire/patiencecardgame.cpp
@@ -14,12 +14,13 @@
 ** 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 "patiencecardgame.h"
 
 
 int highestZ = 0;
 
 
@@ -114,15 +115,17 @@ void PatienceCardGame::deal(void)
 
 
 void PatienceCardGame::readConfig( Config& cfg )
 {
     cfg.setGroup("GameState");
 
-	deckTurns = cfg.readNumEntry("DeckTurns", 2500);
+    // todo: make this eventually configurable
+    deckTurns = cfg.readNumEntry("DeckTurns", 2);
     // 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
 
@@ -208,13 +211,13 @@ bool PatienceCardGame::mousePressCard( Card *card, QPoint p )
 
             if ( qt_screen->deviceWidth() < 200 )
                 item->flipTo( 30, (int)item->y() );
             else
                 item->flipTo( 35, (int)item->y() );
         }
-        else return FALSE;				// <- was missing, caused facedown card to react
+        else return FALSE;              // <- was missing, caused facedown card to react
         // to clicking, which is wrong
         moving = NULL;
         moved = FALSE;
 
         // move two other cards if we flip three at a time
         int flipped = 1;
@@ -273,16 +276,17 @@ void PatienceCardGame::mousePress(QPoint p)
         throughDeck();
 
         moved = TRUE;
     }
 }
 
-
-bool PatienceCardGame::canTurnOverDeck() {
-	return (numberOfTimesThroughDeck != deckTurns);
+bool PatienceCardGame::canTurnOverDeck()
+{
+    return (numberOfTimesThroughDeck != deckTurns);
 }
 
-void PatienceCardGame::throughDeck() {
-	numberOfTimesThroughDeck++;
-	if (numberOfTimesThroughDeck == deckTurns)
-		circleCross->setCross();
- }
+void PatienceCardGame::throughDeck()
+{
+    numberOfTimesThroughDeck++;
+    if (numberOfTimesThroughDeck == deckTurns)
+        circleCross->setCross();
+}