summaryrefslogtreecommitdiff
authortille <tille>2002-07-10 13:58:19 (UTC)
committer tille <tille>2002-07-10 13:58:19 (UTC)
commit6fefe6d5f0b7721e8f692ad8759666f3c50cd437 (patch) (side-by-side diff)
treefa55166dba5b4366479a9c96c9efcc35a4ab7a02
parentdcf25882f9093a34571454ec7bb2ecb821575498 (diff)
downloadopie-6fefe6d5f0b7721e8f692ad8759666f3c50cd437.zip
opie-6fefe6d5f0b7721e8f692ad8759666f3c50cd437.tar.gz
opie-6fefe6d5f0b7721e8f692ad8759666f3c50cd437.tar.bz2
tr(comments)
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/games/solitaire/canvascardgame.cpp4
-rw-r--r--noncore/games/solitaire/chicanecardgame.cpp8
-rw-r--r--noncore/games/solitaire/chicanecardgame.h17
-rw-r--r--noncore/games/solitaire/harpcardgame.cpp10
-rw-r--r--noncore/games/solitaire/harpcardgame.h18
-rw-r--r--noncore/games/solitaire/teeclubcardgame.cpp12
-rw-r--r--noncore/games/solitaire/teeclubcardgame.h27
7 files changed, 74 insertions, 22 deletions
diff --git a/noncore/games/solitaire/canvascardgame.cpp b/noncore/games/solitaire/canvascardgame.cpp
index 4404b04..8e07cc8 100644
--- a/noncore/games/solitaire/canvascardgame.cpp
+++ b/noncore/games/solitaire/canvascardgame.cpp
@@ -377,4 +377,4 @@ void CanvasCardGame::readPile( Config& cfg, CardPile *pile, QString name, int& h
card->setFace(facing);
- card->setCardPile(pile); // cam: setCardPile muss vor addCardToTop passieren
- pile->addCardToTop(card); // weil sonst absturz wg cardAddedToTop
+ card->setCardPile(pile); // cam: setCardPile has to happen bevor addCardToTop
+ pile->addCardToTop(card); // due to a empty pointer if you use cardAddedToTop
QPoint p = pile->getCardPos( card );
diff --git a/noncore/games/solitaire/chicanecardgame.cpp b/noncore/games/solitaire/chicanecardgame.cpp
index a242419..6729a94 100644
--- a/noncore/games/solitaire/chicanecardgame.cpp
+++ b/noncore/games/solitaire/chicanecardgame.cpp
@@ -19,3 +19,9 @@
**
-** Modified by C.A.Mader 2002
+** created on base of patiencecardgame by cam (C.A.Mader) 2002
+** Rules for this game:
+** use 2 decks = 104 cards
+** deal 8 rows with 3 hidden cards and one open card
+** append red to black and vice versa
+** each card can be layed on a free place
+** deal 8 cards at once
**
diff --git a/noncore/games/solitaire/chicanecardgame.h b/noncore/games/solitaire/chicanecardgame.h
index 668f5f4..f6bd08e 100644
--- a/noncore/games/solitaire/chicanecardgame.h
+++ b/noncore/games/solitaire/chicanecardgame.h
@@ -18,2 +18,11 @@
**
+**
+** created on base of patiencecardgame by cam (C.A.Mader) 2002
+** Rules for this game:
+** use 2 decks = 104 cards
+** deal 8 rows with 3 hidden cards and one open card
+** append red to black and vice versa
+** each card can be layed on a free place
+** deal 8 cards at once
+**
**********************************************************************/
@@ -52,4 +61,4 @@ public:
if ( card->isFacing() &&
-// ( ( ( cardOnTop() == NULL ) && (card->getValue() == king) ) || // diese Zeile sorgt dafür dass nur Kings auf leere Plätze dürfen
- ( (cardOnTop() == NULL) || // auf einen Freiplatz darf alles!
+// ( ( ( cardOnTop() == NULL ) && (card->getValue() == king) ) || // only kings are allowed on empty places
+ ( (cardOnTop() == NULL) || // each card can use an empty place
( (cardOnTop() != NULL) &&
@@ -94,3 +103,3 @@ public:
// yet flipped, but will become flipped
- top = QPoint( top.x(), top.y() - 3 ); // Keine Verschiebung!
+ top = QPoint( top.x(), top.y() - 3 ); // no moving to the side
newTopCard->flipTo( top.x(), top.y() );
@@ -110,3 +119,3 @@ public:
} else {
- x += 0; // Keine Verschiebung!
+ x += 0; // no moving to the side
y += 3;
diff --git a/noncore/games/solitaire/harpcardgame.cpp b/noncore/games/solitaire/harpcardgame.cpp
index 22715ec..0711622 100644
--- a/noncore/games/solitaire/harpcardgame.cpp
+++ b/noncore/games/solitaire/harpcardgame.cpp
@@ -19,3 +19,11 @@
**
-** Modified by C.A.Mader 2002
+** created on base of patiencecardgame by cam (C.A.Mader) 2002
+** Rules for this game:
+** use 2 decks = 104 cards
+** deal 8 rows with one open card in the first place
+** one hidden and one open in the second place and so on
+** append red to black and vice versa
+** each card can be layed on a free place
+** deal 8 cards at once
+**
**
diff --git a/noncore/games/solitaire/harpcardgame.h b/noncore/games/solitaire/harpcardgame.h
index d1733fd..18b95e3 100644
--- a/noncore/games/solitaire/harpcardgame.h
+++ b/noncore/games/solitaire/harpcardgame.h
@@ -18,2 +18,12 @@
**
+**
+** created on base of patiencecardgame by cam (C.A.Mader) 2002
+** Rules for this game:
+** use 2 decks = 104 cards
+** deal 8 rows with one open card in the first place
+** one hidden and one open in the second place and so on
+** append red to black and vice versa
+** each card can be layed on a free place
+** deal 8 cards at once
+**
**********************************************************************/
@@ -52,4 +62,4 @@ public:
if ( card->isFacing() &&
-// ( ( ( cardOnTop() == NULL ) && (card->getValue() == king) ) || // diese Zeile sorgt dafür dass nur Kings auf leere Plätze dürfen
- ( (cardOnTop() == NULL) || // auf einen Freiplatz darf alles!
+// ( ( ( cardOnTop() == NULL ) && (card->getValue() == king) ) || // only kings are allowed on empty places
+ ( (cardOnTop() == NULL) || // aeach card can use an emply place
( (cardOnTop() != NULL) &&
@@ -94,3 +104,3 @@ public:
// yet flipped, but will become flipped
- top = QPoint( top.x(), top.y() - 3 ); // Keine Verschiebung!
+ top = QPoint( top.x(), top.y() - 3 ); // no moving to the side
newTopCard->flipTo( top.x(), top.y() );
@@ -110,3 +120,3 @@ public:
} else {
- x += 0; // Keine Verschiebung!
+ x += 0; // no moving to the side
y += 3;
diff --git a/noncore/games/solitaire/teeclubcardgame.cpp b/noncore/games/solitaire/teeclubcardgame.cpp
index e15da96..0941e0d 100644
--- a/noncore/games/solitaire/teeclubcardgame.cpp
+++ b/noncore/games/solitaire/teeclubcardgame.cpp
@@ -19,3 +19,11 @@
**
-** Modified by C.A.Mader 2002
+** created on base of patiencecardgame by cam (C.A.Mader) 2002
+** Rules for this game:
+** use 2 decks = 104 cards
+** deal 9 rows with 5 open cards each
+** append one card to each other card which is one step higher
+** move only columns of cards which are equal in suit
+** each card can be layed on a free place
+** deal 1 card at once on the first pile
+**
**
@@ -86,3 +94,3 @@ void TeeclubCardGame::resizePiles()
while ((workingPiles[i]->getCardPos(NULL).y() > 230) && (workingPiles[i]->getOffsetDown()>1)) {
- // Resizen des Stapels
+ // resize the pile
workingPiles[i]->setOffsetDown(workingPiles[i]->getOffsetDown()-1);
diff --git a/noncore/games/solitaire/teeclubcardgame.h b/noncore/games/solitaire/teeclubcardgame.h
index 06d49f8..25cfaf9 100644
--- a/noncore/games/solitaire/teeclubcardgame.h
+++ b/noncore/games/solitaire/teeclubcardgame.h
@@ -18,2 +18,13 @@
**
+**
+** created on base of patiencecardgame by cam (C.A.Mader) 2002
+** Rules for this game:
+** use 2 decks = 104 cards
+** deal 9 rows with 5 open cards each
+** append one card to each other card which is one step higher
+** move only columns of cards which are equal in suit
+** each card can be layed on a free place
+** deal 1 card at once on the first pile
+**
+**
**********************************************************************/
@@ -51,3 +62,3 @@ public:
if (card->isFacing()) return FALSE;
- return FALSE; // die Toten ruhn
+ return FALSE; // the deads are sleeping forever
}
@@ -64,6 +75,6 @@ public:
if ( card->isFacing() &&
-// ( ( ( cardOnTop() == NULL ) && (card->getValue() == king) ) || // diese Zeile sorgt dafür dass nur Kings auf leere Plätze dürfen
- ( (cardOnTop() == NULL) || // auf einen Freiplatz darf alles!
+// ( ( ( cardOnTop() == NULL ) && (card->getValue() == king) ) || // use this if only Kings are allowed on empty places
+ ( (cardOnTop() == NULL) || // each card can use an empty place
( (cardOnTop() != NULL) &&
- ((int)card->getValue() + 1 == (int)cardOnTop()->getValue()) // bei teeclub sind die farben zum Anlegen egal
+ ((int)card->getValue() + 1 == (int)cardOnTop()->getValue()) // you can append every color on every color
) ) )
@@ -107,3 +118,3 @@ public:
// yet flipped, but will become flipped
- top = QPoint( top.x(), top.y() - 3 ); // Keine seitliche Verschiebung!
+ top = QPoint( top.x(), top.y() - 3 ); // no moving to the side
newTopCard->flipTo( top.x(), top.y() );
@@ -116,3 +127,3 @@ public:
if ((getCardPos(NULL).y() < 230) && (getOffsetDown()<13)) {
- // Resizen des Stapels
+ // resize the pile
beginDealing();
@@ -138,3 +149,3 @@ public:
} else {
- x += 0; // Keine seitliche Verschiebung!
+ x += 0; // no moving to the side
y += 3;
@@ -156,3 +167,3 @@ public:
while (isPileResize() && (getCardPos(NULL).y() > 230) && (getOffsetDown()>1)) {
- // Resizen des Stapels
+ // resize the pile
beginDealing();