-rw-r--r-- | noncore/games/solitaire/patiencecardgame.cpp | 26 |
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 @@ | |||
14 | ** See http://www.trolltech.com/gpl/ for GPL licensing information. | 14 | ** See http://www.trolltech.com/gpl/ for GPL licensing information. |
15 | ** | 15 | ** |
16 | ** Contact info@trolltech.com if any conditions of this licensing are | 16 | ** Contact info@trolltech.com if any conditions of this licensing are |
17 | ** not clear to you. | 17 | ** not clear to you. |
18 | ** | 18 | ** |
19 | **********************************************************************/ | 19 | **********************************************************************/ |
20 | |||
20 | #include "patiencecardgame.h" | 21 | #include "patiencecardgame.h" |
21 | 22 | ||
22 | 23 | ||
23 | int highestZ = 0; | 24 | int highestZ = 0; |
24 | 25 | ||
25 | 26 | ||
@@ -114,15 +115,17 @@ void PatienceCardGame::deal(void) | |||
114 | 115 | ||
115 | 116 | ||
116 | void PatienceCardGame::readConfig( Config& cfg ) | 117 | void PatienceCardGame::readConfig( Config& cfg ) |
117 | { | 118 | { |
118 | cfg.setGroup("GameState"); | 119 | cfg.setGroup("GameState"); |
119 | 120 | ||
120 | deckTurns = cfg.readNumEntry("DeckTurns", 2500); | 121 | // todo: make this eventually configurable |
122 | deckTurns = cfg.readNumEntry("DeckTurns", 2); | ||
121 | // Do we have a config file to read in? | 123 | // Do we have a config file to read in? |
122 | if ( !cfg.hasKey("numberOfTimesThroughDeck") ) { | 124 | if ( !cfg.hasKey("numberOfTimesThroughDeck") ) |
125 | { | ||
123 | // if not, create a new game | 126 | // if not, create a new game |
124 | newGame(); | 127 | newGame(); |
125 | return; | 128 | return; |
126 | } | 129 | } |
127 | // We have a config file, lets read it in and use it | 130 | // We have a config file, lets read it in and use it |
128 | 131 | ||
@@ -208,13 +211,13 @@ bool PatienceCardGame::mousePressCard( Card *card, QPoint p ) | |||
208 | 211 | ||
209 | if ( qt_screen->deviceWidth() < 200 ) | 212 | if ( qt_screen->deviceWidth() < 200 ) |
210 | item->flipTo( 30, (int)item->y() ); | 213 | item->flipTo( 30, (int)item->y() ); |
211 | else | 214 | else |
212 | item->flipTo( 35, (int)item->y() ); | 215 | item->flipTo( 35, (int)item->y() ); |
213 | } | 216 | } |
214 | else return FALSE; // <- was missing, caused facedown card to react | 217 | else return FALSE; // <- was missing, caused facedown card to react |
215 | // to clicking, which is wrong | 218 | // to clicking, which is wrong |
216 | moving = NULL; | 219 | moving = NULL; |
217 | moved = FALSE; | 220 | moved = FALSE; |
218 | 221 | ||
219 | // move two other cards if we flip three at a time | 222 | // move two other cards if we flip three at a time |
220 | int flipped = 1; | 223 | int flipped = 1; |
@@ -273,16 +276,17 @@ void PatienceCardGame::mousePress(QPoint p) | |||
273 | throughDeck(); | 276 | throughDeck(); |
274 | 277 | ||
275 | moved = TRUE; | 278 | moved = TRUE; |
276 | } | 279 | } |
277 | } | 280 | } |
278 | 281 | ||
279 | 282 | bool PatienceCardGame::canTurnOverDeck() | |
280 | bool PatienceCardGame::canTurnOverDeck() { | 283 | { |
281 | return (numberOfTimesThroughDeck != deckTurns); | 284 | return (numberOfTimesThroughDeck != deckTurns); |
282 | } | 285 | } |
283 | 286 | ||
284 | void PatienceCardGame::throughDeck() { | 287 | void PatienceCardGame::throughDeck() |
285 | numberOfTimesThroughDeck++; | 288 | { |
286 | if (numberOfTimesThroughDeck == deckTurns) | 289 | numberOfTimesThroughDeck++; |
287 | circleCross->setCross(); | 290 | if (numberOfTimesThroughDeck == deckTurns) |
288 | } | 291 | circleCross->setCross(); |
292 | } | ||