Diffstat (limited to 'noncore/games/solitaire/patiencecardgame.cpp') (more/less context) (ignore whitespace changes)
-rw-r--r-- | noncore/games/solitaire/patiencecardgame.cpp | 13 |
1 files changed, 11 insertions, 2 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) | |||
96 | card->showCard(); | 96 | card->showCard(); |
97 | highestZ++; | 97 | highestZ++; |
98 | } | 98 | } |
99 | } | 99 | } |
100 | 100 | ||
101 | for ( ; t < 52; t++) | 101 | for ( ; t < 52; t++) |
102 | { | 102 | { |
103 | Card *card = cards[t]; | 103 | Card *card = cards[t]; |
104 | faceDownDealingPile->addCardToTop(card); | 104 | faceDownDealingPile->addCardToTop(card); |
105 | card->setCardPile( faceDownDealingPile ); | 105 | card->setCardPile( faceDownDealingPile ); |
106 | QPoint p = faceDownDealingPile->getCardPos( card ); | 106 | QPoint p = faceDownDealingPile->getCardPos( card ); |
107 | card->setPos( p.x(), p.y(), highestZ ); | 107 | card->setPos( p.x(), p.y(), highestZ ); |
108 | card->showCard(); | 108 | card->showCard(); |
109 | highestZ++; | 109 | highestZ++; |
110 | } | 110 | } |
111 | 111 | ||
112 | endDealing(); | 112 | endDealing(); |
113 | } | 113 | } |
114 | 114 | ||
115 | 115 | ||
116 | void PatienceCardGame::readConfig( Config& cfg ) | 116 | void PatienceCardGame::readConfig( Config& cfg ) |
117 | { | 117 | { |
118 | cfg.setGroup("GameState"); | 118 | cfg.setGroup("GameState"); |
119 | 119 | ||
120 | deckTurns = cfg.readNumEntry("DeckTurns", 2500); | ||
120 | // Do we have a config file to read in? | 121 | // Do we have a config file to read in? |
121 | if ( !cfg.hasKey("numberOfTimesThroughDeck") ) | 122 | if ( !cfg.hasKey("numberOfTimesThroughDeck") ) { |
122 | { | ||
123 | // if not, create a new game | 123 | // if not, create a new game |
124 | newGame(); | 124 | newGame(); |
125 | return; | 125 | return; |
126 | } | 126 | } |
127 | // We have a config file, lets read it in and use it | 127 | // We have a config file, lets read it in and use it |
128 | 128 | ||
129 | // Create Cards, but don't shuffle or deal them yet | 129 | // Create Cards, but don't shuffle or deal them yet |
130 | createDeck(); | 130 | createDeck(); |
131 | 131 | ||
132 | // How many times through the deck have we been | 132 | // How many times through the deck have we been |
133 | numberOfTimesThroughDeck = cfg.readNumEntry("numberOfTimesThroughDeck"); | 133 | numberOfTimesThroughDeck = cfg.readNumEntry("numberOfTimesThroughDeck"); |
134 | 134 | ||
135 | // restore state to the circle/cross under the dealing pile | 135 | // restore state to the circle/cross under the dealing pile |
136 | if ( canTurnOverDeck() ) | 136 | if ( canTurnOverDeck() ) |
137 | circleCross->setCircle(); | 137 | circleCross->setCircle(); |
138 | else | 138 | else |
139 | circleCross->setCross(); | 139 | circleCross->setCross(); |
140 | 140 | ||
141 | // Move the cards to their piles (deal them to their previous places) | 141 | // Move the cards to their piles (deal them to their previous places) |
142 | beginDealing(); | 142 | beginDealing(); |
143 | 143 | ||
144 | highestZ = 1; | 144 | highestZ = 1; |
145 | 145 | ||
146 | for (int k = 0; k < 7; k++) | 146 | for (int k = 0; k < 7; k++) |
@@ -256,24 +256,33 @@ void PatienceCardGame::mousePress(QPoint p) | |||
256 | (p.y() > 10) && (p.y() < 46) ) | 256 | (p.y() > 10) && (p.y() < 46) ) |
257 | { | 257 | { |
258 | 258 | ||
259 | beginDealing(); | 259 | beginDealing(); |
260 | Card *card = faceUpDealingPile->cardOnTop(); | 260 | Card *card = faceUpDealingPile->cardOnTop(); |
261 | while ( card ) | 261 | while ( card ) |
262 | { | 262 | { |
263 | card->setPos( 5, 10, highestZ ); | 263 | card->setPos( 5, 10, highestZ ); |
264 | card->setFace( FALSE ); | 264 | card->setFace( FALSE ); |
265 | faceUpDealingPile->removeCard( card ); | 265 | faceUpDealingPile->removeCard( card ); |
266 | faceDownDealingPile->addCardToTop( card ); | 266 | faceDownDealingPile->addCardToTop( card ); |
267 | card->setCardPile( faceDownDealingPile ); | 267 | card->setCardPile( faceDownDealingPile ); |
268 | card = faceUpDealingPile->cardOnTop(); | 268 | card = faceUpDealingPile->cardOnTop(); |
269 | highestZ++; | 269 | highestZ++; |
270 | } | 270 | } |
271 | endDealing(); | 271 | endDealing(); |
272 | 272 | ||
273 | throughDeck(); | 273 | throughDeck(); |
274 | 274 | ||
275 | moved = TRUE; | 275 | moved = TRUE; |
276 | } | 276 | } |
277 | } | 277 | } |
278 | 278 | ||
279 | 279 | ||
280 | bool PatienceCardGame::canTurnOverDeck() { | ||
281 | return (numberOfTimesThroughDeck != deckTurns); | ||
282 | } | ||
283 | |||
284 | void PatienceCardGame::throughDeck() { | ||
285 | numberOfTimesThroughDeck++; | ||
286 | if (numberOfTimesThroughDeck == deckTurns) | ||
287 | circleCross->setCross(); | ||
288 | } | ||