summaryrefslogtreecommitdiff
authorar <ar>2003-12-02 22:04:54 (UTC)
committer ar <ar>2003-12-02 22:04:54 (UTC)
commitcf060dacacf1889b50e6d07d1aa041c634bcb7d9 (patch) (side-by-side diff)
treee54423106c4fe51e515cb41e0c0dc934aebb5685
parentd5b6b246978ff34fb21b3306899c997528f8341c (diff)
downloadopie-cf060dacacf1889b50e6d07d1aa041c634bcb7d9.zip
opie-cf060dacacf1889b50e6d07d1aa041c634bcb7d9.tar.gz
opie-cf060dacacf1889b50e6d07d1aa041c634bcb7d9.tar.bz2
Close Bug 0000299
Redesign of Quellcode
Diffstat (more/less context) (show whitespace changes)
-rw-r--r--noncore/games/solitaire/patiencecardgame.cpp66
1 files changed, 44 insertions, 22 deletions
diff --git a/noncore/games/solitaire/patiencecardgame.cpp b/noncore/games/solitaire/patiencecardgame.cpp
index 1b38072..96a599c 100644
--- a/noncore/games/solitaire/patiencecardgame.cpp
+++ b/noncore/games/solitaire/patiencecardgame.cpp
@@ -29,29 +29,36 @@ PatienceCardGame::PatienceCardGame(QCanvas *c, bool snap, QWidget *parent) : Can
numberOfTimesThroughDeck = 0;
highestZ = 0;
- if ( qt_screen->deviceWidth() < 200 ) {
+ if ( qt_screen->deviceWidth() < 200 )
+ {
circleCross = new CanvasCircleOrCross( 7, 16, canvas() );
rectangle = new CanvasRoundRect( 30, 10, canvas() );
- for (int i = 0; i < 4; i++) {
+ for (int i = 0; i < 4; i++)
+ {
discardPiles[i] = new PatienceDiscardPile( 78 + i * 23, 10, canvas() );
addCardPile(discardPiles[i]);
}
- for (int i = 0; i < 7; i++) {
+ for (int i = 0; i < 7; i++)
+ {
workingPiles[i] = new PatienceWorkingPile( 5 + i * 23, 50, canvas() );
addCardPile(workingPiles[i]);
}
faceDownDealingPile = new PatienceFaceDownDeck( 5, 10, canvas() );
faceUpDealingPile = new PatienceFaceUpDeck( 30, 10, canvas() );
- } else {
+ }
+ else
+ {
circleCross = new CanvasCircleOrCross( 7, 18, canvas() );
rectangle = new CanvasRoundRect( 35, 10, canvas() );
- for (int i = 0; i < 4; i++) {
+ for (int i = 0; i < 4; i++)
+ {
discardPiles[i] = new PatienceDiscardPile( 110 + i * 30, 10, canvas() );
addCardPile(discardPiles[i]);
}
- for (int i = 0; i < 7; i++) {
+ for (int i = 0; i < 7; i++)
+ {
workingPiles[i] = new PatienceWorkingPile( 10 + i * 30, 50, canvas() );
addCardPile(workingPiles[i]);
}
@@ -77,9 +84,11 @@ void PatienceCardGame::deal(void)
beginDealing();
- for (int i = 0; i < 7; i++) {
+ for (int i = 0; i < 7; i++)
+ {
cards[t]->setFace(TRUE);
- for (int k = i; k < 7; k++, t++) {
+ for (int k = i; k < 7; k++, t++)
+ {
Card *card = cards[t];
workingPiles[k]->addCardToTop(card);
card->setCardPile( workingPiles[k] );
@@ -90,7 +99,8 @@ void PatienceCardGame::deal(void)
}
}
- for ( ; t < 52; t++) {
+ for ( ; t < 52; t++)
+ {
Card *card = cards[t];
faceDownDealingPile->addCardToTop(card);
card->setCardPile( faceDownDealingPile );
@@ -109,7 +119,8 @@ void PatienceCardGame::readConfig( Config& cfg )
cfg.setGroup("GameState");
// 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;
@@ -120,7 +131,7 @@ void PatienceCardGame::readConfig( Config& cfg )
createDeck();
// How many times through the deck have we been
- numberOfTimesThroughDeck = cfg.readNumEntry("NumberOfTimesThroughDeck");
+ numberOfTimesThroughDeck = cfg.readNumEntry("numberOfTimesThroughDeck");
// restore state to the circle/cross under the dealing pile
if ( canTurnOverDeck() )
@@ -133,13 +144,15 @@ void PatienceCardGame::readConfig( Config& cfg )
highestZ = 1;
- for (int k = 0; k < 7; k++) {
+ for (int k = 0; k < 7; k++)
+ {
QString pile;
pile.sprintf( "WorkingPile%i", k );
readPile( cfg, workingPiles[k], pile, highestZ );
}
- for (int k = 0; k < 4; k++) {
+ for (int k = 0; k < 4; k++)
+ {
QString pile;
pile.sprintf( "DiscardPile%i", k );
readPile( cfg, discardPiles[k], pile, highestZ );
@@ -159,12 +172,14 @@ void PatienceCardGame::writeConfig( Config& cfg )
cfg.setGroup("GameState");
cfg.writeEntry("numberOfTimesThroughDeck", numberOfTimesThroughDeck);
- for ( int i = 0; i < 7; i++ ) {
+ for ( int i = 0; i < 7; i++ )
+ {
QString pile;
pile.sprintf( "WorkingPile%i", i );
workingPiles[i]->writeConfig( cfg, pile );
}
- for ( int i = 0; i < 4; i++ ) {
+ for ( int i = 0; i < 4; i++ )
+ {
QString pile;
pile.sprintf( "DiscardPile%i", i );
discardPiles[i]->writeConfig( cfg, pile );
@@ -179,9 +194,11 @@ bool PatienceCardGame::mousePressCard( Card *card, QPoint p )
Q_UNUSED(p);
CanvasCard *item = (CanvasCard *)card;
- if (item->isFacing() != TRUE) {
+ if (item->isFacing() != TRUE)
+ {
// From facedown stack
- if ((item->x() == 5) && ((int)item->y() == 10)) {
+ if ((item->x() == 5) && ((int)item->y() == 10))
+ {
item->setZ(highestZ);
highestZ++;
@@ -194,7 +211,8 @@ bool PatienceCardGame::mousePressCard( Card *card, QPoint p )
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;
@@ -202,8 +220,10 @@ bool PatienceCardGame::mousePressCard( Card *card, QPoint p )
// move two other cards if we flip three at a time
int flipped = 1;
QCanvasItemList l = canvas()->collisions( p );
- for (QCanvasItemList::Iterator it = l.begin(); (it != l.end()) && (flipped != cardsDrawn()); ++it) {
- if ( (*it)->rtti() == canvasCardId ) {
+ for (QCanvasItemList::Iterator it = l.begin(); (it != l.end()) && (flipped != cardsDrawn()); ++it)
+ {
+ if ( (*it)->rtti() == canvasCardId )
+ {
CanvasCard *item = (CanvasCard *)*it;
if (item->animated())
continue;
@@ -234,11 +254,13 @@ void PatienceCardGame::mousePress(QPoint p)
{
if ( canTurnOverDeck() &&
(p.x() > 5) && (p.x() < 28) &&
- (p.y() > 10) && (p.y() < 46) ) {
+ (p.y() > 10) && (p.y() < 46) )
+ {
beginDealing();
Card *card = faceUpDealingPile->cardOnTop();
- while ( card ) {
+ while ( card )
+ {
card->setPos( 5, 10, highestZ );
card->setFace( FALSE );
faceUpDealingPile->removeCard( card );