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
@@ -328,10 +328,11 @@ void CanvasCardGame::contentsMouseReleaseEvent(QMouseEvent *e)
 				oldPile->removeCard(item);
 			    }    
-			    pile->addCardToTop(item);
 			    item->setCardPile(pile);
 			    //item->move( pile->getCardPos(item) );
+			    pile->addCardToTop(item);
 			    QPoint p = pile->getCardPos(item);
 			    item->setPos( p.x(), p.y(), highestZ );
 			    highestZ++;
+				checkUnusable();   // added for freecell to move card to discard pile
 
 			    if (item->getValue() == king && haveWeWon()) {
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
@@ -79,4 +79,5 @@ protected:
     void contentsMouseReleaseEvent(QMouseEvent *e);
     void contentsMouseMoveEvent(QMouseEvent *e);
+	virtual	void checkUnusable() { }  //added for freecell
 
 protected:
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
@@ -70,4 +70,87 @@ void FreecellCardGame::deal(void)
 }
 
+// 	checks if smaller card with different color, that could be put on top on the
+// 	card, is present in working or freecell pile
+bool FreecellCardGame::checkNeeded(Card *card)
+{
+	if (card->getValue() > 2){
+		int i;
+		Card *c;
+		for (i=0;i<4;i++){
+			c = freecellPiles[i]->cardOnBottom();
+			if (c != NULL){
+				if (card->isRed()!= c->isRed() && card->getValue()== c->getValue()+1){
+					return (false); 
+				}
+			}
+		}
+		for (i=0;i<8;i++){
+			c=workingPiles[i]->cardOnBottom();
+			while (c!=NULL){
+				if (card->isRed() != c->isRed()	&& card->getValue() == c->getValue()+1) {
+					return (false);
+				}
+				c=workingPiles[i]->cardInfront(c);
+			}
+		}
+	}
+	return(true);
+}
+	
+//  added to move cards, on which no card can be moved, to discard pile 
+void FreecellCardGame::checkUnusable()
+{
+	int i,j;
+//	printf("void FreecellCardGame::checkUnusable()\n");
+	Card *top_one;
+	for (i=0;i < 8;i++)
+	{
+		top_one = workingPiles[i]->cardOnTop();
+		if (top_one != NULL)
+		{
+			j = 0;
+			while ((j < 4))
+			{
+				if (discardPiles[j]->isAllowedOnTop(top_one)){
+					if (checkNeeded(top_one)){
+						top_one->setCardPile(discardPiles[j]);
+						workingPiles[i]->removeCard(top_one);
+//						printf("k %d f work%d to disk%d on %d\n ",top_one->getValue(),i+1,j+1,highestZ);
+						discardPiles[j]->addCardToTop(top_one);
+						top_one->setPos(discardPiles[j]->getX(),discardPiles[j]->getY(),highestZ);
+						highestZ++;
+						j = 4;
+						checkUnusable();
+					}
+				}
+				j++;
+			}
+		} 
+	}
+	for (i=0;i<4;i++){
+		top_one = freecellPiles[i]->cardOnTop();
+		if (top_one != NULL)
+		{
+			j = 0;
+			while ((j < 4))
+			{
+				if (discardPiles[j]->isAllowedOnTop(top_one)){
+					if (checkNeeded(top_one)){
+						top_one->setCardPile(discardPiles[j]);
+						freecellPiles[i]->removeCard(top_one);
+//						printf("k %d f work%d to disk%d on %d\n ",top_one->getValue(),i+1,j+1,highestZ);
+						discardPiles[j]->addCardToTop(top_one);
+						top_one->setPos(discardPiles[j]->getX(),discardPiles[j]->getY(),highestZ);
+						highestZ++;
+						j = 4;
+						checkUnusable();
+					}
+				}
+				j++;
+			}
+		} 
+	}		
+}
+
 
 bool FreecellCardGame::mousePressCard( Card *c, QPoint p )
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
@@ -63,4 +63,5 @@ public:
     }
     
+
     virtual bool isAllowedToBeMoved(Card *card) {
 	int nextExpectedValue = (int)card->getValue();
@@ -139,8 +140,10 @@ public:
     virtual void mouseReleaseCard(Card *card, QPoint p) { Q_UNUSED(card); Q_UNUSED(p); }
 //    virtual void mouseMoveCard(Card *card, QPoint p) { Q_UNUSED(card); Q_UNUSED(p); }
+     virtual void checkUnusable();
     void readConfig( Config& cfg );
     void writeConfig( Config& cfg );
     bool snapOn;
 private:
+    bool checkNeeded(Card *card);
     FreecellFreecellPile *freecellPiles[8];
     FreecellWorkingPile *workingPiles[8];