author | harlekin <harlekin> | 2003-04-25 09:02:41 (UTC) |
---|---|---|
committer | harlekin <harlekin> | 2003-04-25 09:02:41 (UTC) |
commit | bddc2d168776bf7674f9b938f8889051fb9fa7a8 (patch) (unidiff) | |
tree | 5b03d071f18e30e1b023c7bbd07c49346e1ef428 /noncore | |
parent | 25ab69ab9964a8de1c05f9ff659a4b8a820eb201 (diff) | |
download | opie-bddc2d168776bf7674f9b938f8889051fb9fa7a8.zip opie-bddc2d168776bf7674f9b938f8889051fb9fa7a8.tar.gz opie-bddc2d168776bf7674f9b938f8889051fb9fa7a8.tar.bz2 |
added patch for freecell mode by radofan, closes bug 736, i hope it helps
-rw-r--r-- | noncore/games/solitaire/canvascardgame.cpp | 3 | ||||
-rw-r--r-- | noncore/games/solitaire/canvascardgame.h | 1 | ||||
-rw-r--r-- | noncore/games/solitaire/freecellcardgame.cpp | 83 | ||||
-rw-r--r-- | noncore/games/solitaire/freecellcardgame.h | 3 |
4 files changed, 89 insertions, 1 deletions
diff --git a/noncore/games/solitaire/canvascardgame.cpp b/noncore/games/solitaire/canvascardgame.cpp index 8e07cc8..8250193 100644 --- a/noncore/games/solitaire/canvascardgame.cpp +++ b/noncore/games/solitaire/canvascardgame.cpp | |||
@@ -329,5 +329,5 @@ void CanvasCardGame::contentsMouseReleaseEvent(QMouseEvent *e) | |||
329 | } | 329 | } |
330 | pile->addCardToTop(item); | ||
331 | item->setCardPile(pile); | 330 | item->setCardPile(pile); |
332 | //item->move( pile->getCardPos(item) ); | 331 | //item->move( pile->getCardPos(item) ); |
332 | pile->addCardToTop(item); | ||
333 | QPoint p = pile->getCardPos(item); | 333 | QPoint p = pile->getCardPos(item); |
@@ -335,2 +335,3 @@ void CanvasCardGame::contentsMouseReleaseEvent(QMouseEvent *e) | |||
335 | highestZ++; | 335 | highestZ++; |
336 | checkUnusable(); // added for freecell to move card to discard pile | ||
336 | 337 | ||
diff --git a/noncore/games/solitaire/canvascardgame.h b/noncore/games/solitaire/canvascardgame.h index 0dfb85e..d159de6 100644 --- a/noncore/games/solitaire/canvascardgame.h +++ b/noncore/games/solitaire/canvascardgame.h | |||
@@ -80,2 +80,3 @@ protected: | |||
80 | void contentsMouseMoveEvent(QMouseEvent *e); | 80 | void contentsMouseMoveEvent(QMouseEvent *e); |
81 | virtualvoid checkUnusable() { } //added for freecell | ||
81 | 82 | ||
diff --git a/noncore/games/solitaire/freecellcardgame.cpp b/noncore/games/solitaire/freecellcardgame.cpp index 98415aa..aeb32fc 100644 --- a/noncore/games/solitaire/freecellcardgame.cpp +++ b/noncore/games/solitaire/freecellcardgame.cpp | |||
@@ -71,2 +71,85 @@ void FreecellCardGame::deal(void) | |||
71 | 71 | ||
72 | // checks if smaller card with different color, that could be put on top on the | ||
73 | // card, is present in working or freecell pile | ||
74 | bool FreecellCardGame::checkNeeded(Card *card) | ||
75 | { | ||
76 | if (card->getValue() > 2){ | ||
77 | int i; | ||
78 | Card *c; | ||
79 | for (i=0;i<4;i++){ | ||
80 | c = freecellPiles[i]->cardOnBottom(); | ||
81 | if (c != NULL){ | ||
82 | if (card->isRed()!= c->isRed() && card->getValue()== c->getValue()+1){ | ||
83 | return (false); | ||
84 | } | ||
85 | } | ||
86 | } | ||
87 | for (i=0;i<8;i++){ | ||
88 | c=workingPiles[i]->cardOnBottom(); | ||
89 | while (c!=NULL){ | ||
90 | if (card->isRed() != c->isRed()&& card->getValue() == c->getValue()+1) { | ||
91 | return (false); | ||
92 | } | ||
93 | c=workingPiles[i]->cardInfront(c); | ||
94 | } | ||
95 | } | ||
96 | } | ||
97 | return(true); | ||
98 | } | ||
99 | |||
100 | // added to move cards, on which no card can be moved, to discard pile | ||
101 | void FreecellCardGame::checkUnusable() | ||
102 | { | ||
103 | int i,j; | ||
104 | //printf("void FreecellCardGame::checkUnusable()\n"); | ||
105 | Card *top_one; | ||
106 | for (i=0;i < 8;i++) | ||
107 | { | ||
108 | top_one = workingPiles[i]->cardOnTop(); | ||
109 | if (top_one != NULL) | ||
110 | { | ||
111 | j = 0; | ||
112 | while ((j < 4)) | ||
113 | { | ||
114 | if (discardPiles[j]->isAllowedOnTop(top_one)){ | ||
115 | if (checkNeeded(top_one)){ | ||
116 | top_one->setCardPile(discardPiles[j]); | ||
117 | workingPiles[i]->removeCard(top_one); | ||
118 | // printf("k %d f work%d to disk%d on %d\n ",top_one->getValue(),i+1,j+1,highestZ); | ||
119 | discardPiles[j]->addCardToTop(top_one); | ||
120 | top_one->setPos(discardPiles[j]->getX(),discardPiles[j]->getY(),highestZ); | ||
121 | highestZ++; | ||
122 | j = 4; | ||
123 | checkUnusable(); | ||
124 | } | ||
125 | } | ||
126 | j++; | ||
127 | } | ||
128 | } | ||
129 | } | ||
130 | for (i=0;i<4;i++){ | ||
131 | top_one = freecellPiles[i]->cardOnTop(); | ||
132 | if (top_one != NULL) | ||
133 | { | ||
134 | j = 0; | ||
135 | while ((j < 4)) | ||
136 | { | ||
137 | if (discardPiles[j]->isAllowedOnTop(top_one)){ | ||
138 | if (checkNeeded(top_one)){ | ||
139 | top_one->setCardPile(discardPiles[j]); | ||
140 | freecellPiles[i]->removeCard(top_one); | ||
141 | // printf("k %d f work%d to disk%d on %d\n ",top_one->getValue(),i+1,j+1,highestZ); | ||
142 | discardPiles[j]->addCardToTop(top_one); | ||
143 | top_one->setPos(discardPiles[j]->getX(),discardPiles[j]->getY(),highestZ); | ||
144 | highestZ++; | ||
145 | j = 4; | ||
146 | checkUnusable(); | ||
147 | } | ||
148 | } | ||
149 | j++; | ||
150 | } | ||
151 | } | ||
152 | } | ||
153 | } | ||
154 | |||
72 | 155 | ||
diff --git a/noncore/games/solitaire/freecellcardgame.h b/noncore/games/solitaire/freecellcardgame.h index f1b09ab..2df751b 100644 --- a/noncore/games/solitaire/freecellcardgame.h +++ b/noncore/games/solitaire/freecellcardgame.h | |||
@@ -64,2 +64,3 @@ public: | |||
64 | 64 | ||
65 | |||
65 | virtual bool isAllowedToBeMoved(Card *card) { | 66 | virtual bool isAllowedToBeMoved(Card *card) { |
@@ -140,2 +141,3 @@ public: | |||
140 | // virtual void mouseMoveCard(Card *card, QPoint p) { Q_UNUSED(card); Q_UNUSED(p); } | 141 | // virtual void mouseMoveCard(Card *card, QPoint p) { Q_UNUSED(card); Q_UNUSED(p); } |
142 | virtual void checkUnusable(); | ||
141 | void readConfig( Config& cfg ); | 143 | void readConfig( Config& cfg ); |
@@ -144,2 +146,3 @@ public: | |||
144 | private: | 146 | private: |
147 | bool checkNeeded(Card *card); | ||
145 | FreecellFreecellPile *freecellPiles[8]; | 148 | FreecellFreecellPile *freecellPiles[8]; |