-rw-r--r-- | noncore/games/solitaire/patiencecardgame.cpp | 13 | ||||
-rw-r--r-- | noncore/games/solitaire/patiencecardgame.h | 9 |
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 | |||
@@ -108,27 +108,27 @@ void PatienceCardGame::deal(void) | |||
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 | ||
@@ -268,12 +268,21 @@ void PatienceCardGame::mousePress(QPoint p) | |||
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 | } | ||
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 | |||
@@ -164,42 +164,39 @@ public: | |||
164 | private: | 164 | private: |
165 | QPoint top; | 165 | QPoint top; |
166 | 166 | ||
167 | }; | 167 | }; |
168 | 168 | ||
169 | 169 | ||
170 | class PatienceCardGame : public CanvasCardGame | 170 | class PatienceCardGame : public CanvasCardGame |
171 | { | 171 | { |
172 | public: | 172 | public: |
173 | PatienceCardGame(QCanvas *c, bool snap, QWidget *parent = 0); | 173 | PatienceCardGame(QCanvas *c, bool snap, QWidget *parent = 0); |
174 | virtual ~PatienceCardGame(); | 174 | virtual ~PatienceCardGame(); |
175 | virtual void deal(void); | 175 | virtual void deal(void); |
176 | int deckTurns; | ||
176 | virtual bool haveWeWon() { | 177 | virtual bool haveWeWon() { |
177 | return ( discardPiles[0]->kingOnTop() && | 178 | return ( discardPiles[0]->kingOnTop() && |
178 | discardPiles[1]->kingOnTop() && | 179 | discardPiles[1]->kingOnTop() && |
179 | discardPiles[2]->kingOnTop() && | 180 | discardPiles[2]->kingOnTop() && |
180 | discardPiles[3]->kingOnTop() );; | 181 | discardPiles[3]->kingOnTop() );; |
181 | } | 182 | } |
182 | virtual void mousePress(QPoint p); | 183 | virtual void mousePress(QPoint p); |
183 | virtual void mouseRelease(QPoint p) { Q_UNUSED(p); } | 184 | virtual void mouseRelease(QPoint p) { Q_UNUSED(p); } |
184 | // virtual void mouseMove(QPoint p); | 185 | // virtual void mouseMove(QPoint p); |
185 | virtual bool mousePressCard(Card *card, QPoint p); | 186 | virtual bool mousePressCard(Card *card, QPoint p); |
186 | virtual void mouseReleaseCard(Card *card, QPoint p) { Q_UNUSED(card); Q_UNUSED(p); } | 187 | virtual void mouseReleaseCard(Card *card, QPoint p) { Q_UNUSED(card); Q_UNUSED(p); } |
187 | // virtual void mouseMoveCard(Card *card, QPoint p) { Q_UNUSED(card); Q_UNUSED(p); } | 188 | // virtual void mouseMoveCard(Card *card, QPoint p) { Q_UNUSED(card); Q_UNUSED(p); } |
188 | bool canTurnOverDeck(void) { return (numberOfTimesThroughDeck != 3); } | 189 | bool canTurnOverDeck(); |
189 | void throughDeck(void) { | 190 | void throughDeck(); |
190 | numberOfTimesThroughDeck++; | ||
191 | if (numberOfTimesThroughDeck == 3) | ||
192 | circleCross->setCross(); | ||
193 | } | ||
194 | bool snapOn; | 191 | bool snapOn; |
195 | virtual void writeConfig( Config& cfg ); | 192 | virtual void writeConfig( Config& cfg ); |
196 | virtual void readConfig( Config& cfg ); | 193 | virtual void readConfig( Config& cfg ); |
197 | private: | 194 | private: |
198 | CanvasCircleOrCross *circleCross; | 195 | CanvasCircleOrCross *circleCross; |
199 | CanvasRoundRect *rectangle; | 196 | CanvasRoundRect *rectangle; |
200 | PatienceWorkingPile *workingPiles[7]; | 197 | PatienceWorkingPile *workingPiles[7]; |
201 | PatienceDiscardPile *discardPiles[4]; | 198 | PatienceDiscardPile *discardPiles[4]; |
202 | PatienceFaceDownDeck *faceDownDealingPile; | 199 | PatienceFaceDownDeck *faceDownDealingPile; |
203 | PatienceFaceUpDeck *faceUpDealingPile; | 200 | PatienceFaceUpDeck *faceUpDealingPile; |
204 | int numberOfTimesThroughDeck; | 201 | int numberOfTimesThroughDeck; |
205 | }; | 202 | }; |