| -rw-r--r-- | noncore/games/solitaire/patiencecardgame.cpp | 66 |
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 @@ -31,3 +31,4 @@ PatienceCardGame::PatienceCardGame(QCanvas *c, bool snap, QWidget *parent) : Can - if ( qt_screen->deviceWidth() < 200 ) { + if ( qt_screen->deviceWidth() < 200 ) + { circleCross = new CanvasCircleOrCross( 7, 16, canvas() ); @@ -35,3 +36,4 @@ PatienceCardGame::PatienceCardGame(QCanvas *c, bool snap, QWidget *parent) : Can - for (int i = 0; i < 4; i++) { + for (int i = 0; i < 4; i++) + { discardPiles[i] = new PatienceDiscardPile( 78 + i * 23, 10, canvas() ); @@ -39,3 +41,4 @@ PatienceCardGame::PatienceCardGame(QCanvas *c, bool snap, QWidget *parent) : Can } - for (int i = 0; i < 7; i++) { + for (int i = 0; i < 7; i++) + { workingPiles[i] = new PatienceWorkingPile( 5 + i * 23, 50, canvas() ); @@ -45,3 +48,5 @@ PatienceCardGame::PatienceCardGame(QCanvas *c, bool snap, QWidget *parent) : Can faceUpDealingPile = new PatienceFaceUpDeck( 30, 10, canvas() ); - } else { + } + else + { circleCross = new CanvasCircleOrCross( 7, 18, canvas() ); @@ -49,3 +54,4 @@ PatienceCardGame::PatienceCardGame(QCanvas *c, bool snap, QWidget *parent) : Can - for (int i = 0; i < 4; i++) { + for (int i = 0; i < 4; i++) + { discardPiles[i] = new PatienceDiscardPile( 110 + i * 30, 10, canvas() ); @@ -53,3 +59,4 @@ PatienceCardGame::PatienceCardGame(QCanvas *c, bool snap, QWidget *parent) : Can } - for (int i = 0; i < 7; i++) { + for (int i = 0; i < 7; i++) + { workingPiles[i] = new PatienceWorkingPile( 10 + i * 30, 50, canvas() ); @@ -79,5 +86,7 @@ void PatienceCardGame::deal(void) - 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]; @@ -92,3 +101,4 @@ void PatienceCardGame::deal(void) - for ( ; t < 52; t++) { + for ( ; t < 52; t++) + { Card *card = cards[t]; @@ -111,3 +121,4 @@ void PatienceCardGame::readConfig( Config& cfg ) // Do we have a config file to read in? - if ( !cfg.hasKey("numberOfTimesThroughDeck") ) { + if ( !cfg.hasKey("numberOfTimesThroughDeck") ) + { // if not, create a new game @@ -122,3 +133,3 @@ void PatienceCardGame::readConfig( Config& cfg ) // How many times through the deck have we been - numberOfTimesThroughDeck = cfg.readNumEntry("NumberOfTimesThroughDeck"); + numberOfTimesThroughDeck = cfg.readNumEntry("numberOfTimesThroughDeck"); @@ -135,3 +146,4 @@ void PatienceCardGame::readConfig( Config& cfg ) - for (int k = 0; k < 7; k++) { + for (int k = 0; k < 7; k++) + { QString pile; @@ -141,3 +153,4 @@ void PatienceCardGame::readConfig( Config& cfg ) - for (int k = 0; k < 4; k++) { + for (int k = 0; k < 4; k++) + { QString pile; @@ -161,3 +174,4 @@ void PatienceCardGame::writeConfig( Config& cfg ) - for ( int i = 0; i < 7; i++ ) { + for ( int i = 0; i < 7; i++ ) + { QString pile; @@ -166,3 +180,4 @@ void PatienceCardGame::writeConfig( Config& cfg ) } - for ( int i = 0; i < 4; i++ ) { + for ( int i = 0; i < 4; i++ ) + { QString pile; @@ -181,5 +196,7 @@ bool PatienceCardGame::mousePressCard( Card *card, QPoint 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); @@ -196,3 +213,4 @@ bool PatienceCardGame::mousePressCard( Card *card, QPoint p ) 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 @@ -204,4 +222,6 @@ bool PatienceCardGame::mousePressCard( Card *card, QPoint p ) 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; @@ -236,3 +256,4 @@ void PatienceCardGame::mousePress(QPoint p) (p.x() > 5) && (p.x() < 28) && - (p.y() > 10) && (p.y() < 46) ) { + (p.y() > 10) && (p.y() < 46) ) + { @@ -240,3 +261,4 @@ void PatienceCardGame::mousePress(QPoint p) Card *card = faceUpDealingPile->cardOnTop(); - while ( card ) { + while ( card ) + { card->setPos( 5, 10, highestZ ); |