- Add dialog to deal cards again after winning solitaire, fixes the winning infinitel...

- Patch by Lucas Suggs, <anakha AT cat DOT pdx DOT edu>
- I modified indentation, added german translation, added English strings to all other languages - work for the translators
- See bug #3288 for more information

svn path=/trunk/; revision=37764

diff --git a/reactos/base/applications/games/solitaire/lang/bg-BG.rc b/reactos/base/applications/games/solitaire/lang/bg-BG.rc
index a77754a..31f8028 100644 (file)
--- a/reactos/base/applications/games/solitaire/lang/bg-BG.rc
+++ b/reactos/base/applications/games/solitaire/lang/bg-BG.rc
@@ -50,6 +50,7 @@ BEGIN
     IDS_SOL_ABOUT   "Solitaire by J Brown\n\nCardLib version 1.0."
     IDS_SOL_QUIT    "Äà ïðåêðàòÿ ëè èãðàòà?"
     IDS_SOL_WIN     "Ïîçäðàâëåíèÿ, ïîáåäèõòå!!"
+    IDS_SOL_DEAL    "Deal again?"
 END
 
 

diff --git a/reactos/base/applications/games/solitaire/lang/ca-ES.rc b/reactos/base/applications/games/solitaire/lang/ca-ES.rc
index ed718ba..af19d6b 100644 (file)
--- a/reactos/base/applications/games/solitaire/lang/ca-ES.rc
+++ b/reactos/base/applications/games/solitaire/lang/ca-ES.rc
@@ -51,6 +51,7 @@ BEGIN
     IDS_SOL_ABOUT   "Solitari per J Brown\n\nCardLib versio 1.0."
     IDS_SOL_QUIT    "Voleu sortir del joc actual?"
     IDS_SOL_WIN     "Felicitats, heu guanyat!!"
+    IDS_SOL_DEAL    "Deal again?"
 END
 
 

diff --git a/reactos/base/applications/games/solitaire/lang/cs-CZ.rc b/reactos/base/applications/games/solitaire/lang/cs-CZ.rc
index a59be5d..cd20312 100644 (file)
--- a/reactos/base/applications/games/solitaire/lang/cs-CZ.rc
+++ b/reactos/base/applications/games/solitaire/lang/cs-CZ.rc
@@ -50,6 +50,7 @@ BEGIN
     IDS_SOL_ABOUT   "Solitaire by J Brown\n\nCardLib verze 1.0."
     IDS_SOL_QUIT    "Ukonèit rozehranou hru?"
     IDS_SOL_WIN     "Gratulujeme, zvítìzili jste!!"
+    IDS_SOL_DEAL    "Deal again?"
 END
 
 

diff --git a/reactos/base/applications/games/solitaire/lang/de-DE.rc b/reactos/base/applications/games/solitaire/lang/de-DE.rc
index 796d392..5168127 100644 (file)
--- a/reactos/base/applications/games/solitaire/lang/de-DE.rc
+++ b/reactos/base/applications/games/solitaire/lang/de-DE.rc
@@ -50,6 +50,7 @@ BEGIN
     IDS_SOL_ABOUT   "Solitär von J Brown\n\nCardLib version 1.0."
     IDS_SOL_QUIT    "Laufendes Spiel beenden?"
     IDS_SOL_WIN     "Glückwunsch, Sie haben Gewonnen!"
+    IDS_SOL_DEAL    "Neu geben?"
 END
 
 

diff --git a/reactos/base/applications/games/solitaire/lang/el-GR.rc b/reactos/base/applications/games/solitaire/lang/el-GR.rc
index 9bc7e90..60c9d20 100644 (file)
--- a/reactos/base/applications/games/solitaire/lang/el-GR.rc
+++ b/reactos/base/applications/games/solitaire/lang/el-GR.rc
@@ -50,6 +50,7 @@ BEGIN
     IDS_SOL_ABOUT   "Solitaire by J Brown\n\nCardLib version 1.0."
     IDS_SOL_QUIT    "Ôåñìáôéóìüò ôïõ ðéá÷íéäéïý áõôïý;"
     IDS_SOL_WIN     "Óõã÷áñçôÞñéá, êåñäßóáôå!!"
+    IDS_SOL_DEAL    "Deal again?"
 END
 
 

diff --git a/reactos/base/applications/games/solitaire/lang/en-US.rc b/reactos/base/applications/games/solitaire/lang/en-US.rc
index 29da556..7b6e1cb 100644 (file)
--- a/reactos/base/applications/games/solitaire/lang/en-US.rc
+++ b/reactos/base/applications/games/solitaire/lang/en-US.rc
@@ -50,7 +50,8 @@ BEGIN
     IDS_SOL_NAME    "Solitaire"
     IDS_SOL_ABOUT   "Solitaire by J Brown\n\nCardLib version 1.0."
     IDS_SOL_QUIT    "Quit the current game?"
-    IDS_SOL_WIN     "Congratulations, you win!!"
+    IDS_SOL_WIN     "Congratulations, you win!"
+    IDS_SOL_DEAL    "Deal again?"
 END
 
 

diff --git a/reactos/base/applications/games/solitaire/lang/es-ES.rc b/reactos/base/applications/games/solitaire/lang/es-ES.rc
index 3146431..e7ab8b5 100644 (file)
--- a/reactos/base/applications/games/solitaire/lang/es-ES.rc
+++ b/reactos/base/applications/games/solitaire/lang/es-ES.rc
@@ -51,6 +51,7 @@ BEGIN
     IDS_SOL_ABOUT   "Solitario por J Brown\n\nCardLib version 1.0."
     IDS_SOL_QUIT    "¿Finalizar el juego actual?"
     IDS_SOL_WIN     "Felicidades, ¡¡Has ganado!!"
+    IDS_SOL_DEAL    "Deal again?"
 END
 
 

diff --git a/reactos/base/applications/games/solitaire/lang/eu-ES.rc b/reactos/base/applications/games/solitaire/lang/eu-ES.rc
index f888889..5d91669 100644 (file)
--- a/reactos/base/applications/games/solitaire/lang/eu-ES.rc
+++ b/reactos/base/applications/games/solitaire/lang/eu-ES.rc
@@ -50,6 +50,7 @@ BEGIN
     IDS_SOL_ABOUT   "Solitarioa J Brown\n\nCardLib-k egina  1.0. bertsioa"
     IDS_SOL_QUIT    "Uneko jokoa amaitu?"
     IDS_SOL_WIN     "Zorionak, irabazi duzu!!"
+    IDS_SOL_DEAL    "Deal again?"
 END
 
 

diff --git a/reactos/base/applications/games/solitaire/lang/fr-FR.rc b/reactos/base/applications/games/solitaire/lang/fr-FR.rc
index b63d69c..cd1d7cb 100644 (file)
--- a/reactos/base/applications/games/solitaire/lang/fr-FR.rc
+++ b/reactos/base/applications/games/solitaire/lang/fr-FR.rc
@@ -50,6 +50,7 @@ BEGIN
     IDS_SOL_ABOUT   "Solitaire par J Brown\n\nCardLib version 1.0."
     IDS_SOL_QUIT    "Quitter le jeu actuel ?"
     IDS_SOL_WIN     "Félicitations ! Vous avez gagné !"
+    IDS_SOL_DEAL    "Deal again?"
 END
 
 

diff --git a/reactos/base/applications/games/solitaire/lang/id-ID.rc b/reactos/base/applications/games/solitaire/lang/id-ID.rc
index b750371..0516ca7 100644 (file)
--- a/reactos/base/applications/games/solitaire/lang/id-ID.rc
+++ b/reactos/base/applications/games/solitaire/lang/id-ID.rc
@@ -51,6 +51,7 @@ BEGIN
     IDS_SOL_ABOUT   "Solitaire by J Brown\n\nCardLib version 1.0."
     IDS_SOL_QUIT    "Quit the current game?"
     IDS_SOL_WIN     "Congratulations, you win!!"
+    IDS_SOL_DEAL    "Deal again?"
 END
 
 

diff --git a/reactos/base/applications/games/solitaire/lang/it-IT.rc b/reactos/base/applications/games/solitaire/lang/it-IT.rc
index ccc753b..ed3eefc 100644 (file)
--- a/reactos/base/applications/games/solitaire/lang/it-IT.rc
+++ b/reactos/base/applications/games/solitaire/lang/it-IT.rc
@@ -51,6 +51,7 @@ BEGIN
     IDS_SOL_ABOUT   "Solitario by J Brown\n\nCardLib versione 1.0."
     IDS_SOL_QUIT    "Chiudere la partita in corso?"
     IDS_SOL_WIN     "Congratulazioni, hai vinto!!"
+    IDS_SOL_DEAL    "Deal again?"
 END
 
 

diff --git a/reactos/base/applications/games/solitaire/lang/ko-KR.rc b/reactos/base/applications/games/solitaire/lang/ko-KR.rc
index 943d901..b557862 100644 (file)
--- a/reactos/base/applications/games/solitaire/lang/ko-KR.rc
+++ b/reactos/base/applications/games/solitaire/lang/ko-KR.rc
@@ -47,6 +47,7 @@ BEGIN
     IDS_SOL_ABOUT   "Solitaire by J Brown\n\nCardLib version 1.0."
     IDS_SOL_QUIT    "ÇöÀç °ÔÀÓÀ» ³¡³¾°¡¿ä?"
     IDS_SOL_WIN     "ÃàÇÏÇÕ´Ï´Ù!!"
+    IDS_SOL_DEAL    "Deal again?"
 END
 
 

diff --git a/reactos/base/applications/games/solitaire/lang/lt-LT.rc b/reactos/base/applications/games/solitaire/lang/lt-LT.rc
index c820d93..6aeffb7 100644 (file)
--- a/reactos/base/applications/games/solitaire/lang/lt-LT.rc
+++ b/reactos/base/applications/games/solitaire/lang/lt-LT.rc
@@ -52,6 +52,7 @@ BEGIN
     IDS_SOL_ABOUT   "Solitaire\n\nSukurta J Brown\n\nCardLib version 1.0."
     IDS_SOL_QUIT    "Baigti þaidimà?"
     IDS_SOL_WIN     "Sveikiname, jûs laimëjote!!"
+    IDS_SOL_DEAL    "Deal again?"
 END
 
 

diff --git a/reactos/base/applications/games/solitaire/lang/no-NO.rc b/reactos/base/applications/games/solitaire/lang/no-NO.rc
index 8eea320..6eb2265 100644 (file)
--- a/reactos/base/applications/games/solitaire/lang/no-NO.rc
+++ b/reactos/base/applications/games/solitaire/lang/no-NO.rc
@@ -51,6 +51,7 @@ BEGIN
     IDS_SOL_ABOUT   "Kabal av J Brown\n\nCardLib versjon 1.0."
     IDS_SOL_QUIT    "Slutt nåværende spill?"
     IDS_SOL_WIN     "Gratulerer, du vant!!"
+    IDS_SOL_DEAL    "Deal again?"
 END
 
 

diff --git a/reactos/base/applications/games/solitaire/lang/pl-PL.rc b/reactos/base/applications/games/solitaire/lang/pl-PL.rc
index eef19cb..ebd698c 100644 (file)
--- a/reactos/base/applications/games/solitaire/lang/pl-PL.rc
+++ b/reactos/base/applications/games/solitaire/lang/pl-PL.rc
@@ -49,6 +49,7 @@ BEGIN
     IDS_SOL_ABOUT   "Solitaire by J. Brown\n\nCardLib version 1.0."
     IDS_SOL_QUIT    "Zakoñczyæ aktualn¹ grê?"
     IDS_SOL_WIN     "Gratulacje, wygra³e\9c!"
+    IDS_SOL_DEAL    "Deal again?"
 END
 
 

diff --git a/reactos/base/applications/games/solitaire/lang/ru-RU.rc b/reactos/base/applications/games/solitaire/lang/ru-RU.rc
index b67b8bf..97c24ce 100644 (file)
--- a/reactos/base/applications/games/solitaire/lang/ru-RU.rc
+++ b/reactos/base/applications/games/solitaire/lang/ru-RU.rc
@@ -44,6 +44,7 @@ BEGIN
     IDS_SOL_ABOUT   "Ïàñüÿíñ îò J Brown\n\nCardLib âåðñèè 1.0."
     IDS_SOL_QUIT    "Çàêîí÷èòü òåêóùóþ èãðó?"
     IDS_SOL_WIN     "Congratulations, you win!!"
+    IDS_SOL_DEAL    "Deal again?"
 END
 
 

diff --git a/reactos/base/applications/games/solitaire/lang/sk-SK.rc b/reactos/base/applications/games/solitaire/lang/sk-SK.rc
index 9913ec2..7a7aeb0 100644 (file)
--- a/reactos/base/applications/games/solitaire/lang/sk-SK.rc
+++ b/reactos/base/applications/games/solitaire/lang/sk-SK.rc
@@ -52,6 +52,7 @@ BEGIN
     IDS_SOL_ABOUT   "Solitér od J Brown\n\nCardLib verzia 1.0"
     IDS_SOL_QUIT    "Naozaj chcete skonèi\9d aktuálnu hru?"
     IDS_SOL_WIN     "Blaho\9eelám, vyhrali ste!"
+    IDS_SOL_DEAL    "Deal again?"
 END
 
 

diff --git a/reactos/base/applications/games/solitaire/lang/th-TH.rc b/reactos/base/applications/games/solitaire/lang/th-TH.rc
index 965e496..77abd0f 100644 (file)
--- a/reactos/base/applications/games/solitaire/lang/th-TH.rc
+++ b/reactos/base/applications/games/solitaire/lang/th-TH.rc
@@ -51,6 +51,7 @@ BEGIN
     IDS_SOL_ABOUT   "Solitaire by J Brown\n\nCardLib version 1.0."
     IDS_SOL_QUIT    "Quit the current game?"
     IDS_SOL_WIN     "Congratulations, you win!!"
+    IDS_SOL_DEAL    "Deal again?"
 END
 
 

diff --git a/reactos/base/applications/games/solitaire/lang/uk-UA.rc b/reactos/base/applications/games/solitaire/lang/uk-UA.rc
index 17f54c5..5cbaa0e 100644 (file)
--- a/reactos/base/applications/games/solitaire/lang/uk-UA.rc
+++ b/reactos/base/applications/games/solitaire/lang/uk-UA.rc
@@ -50,6 +50,7 @@ BEGIN
     IDS_SOL_ABOUT   "Êîñèíêà â³ä J Brown\n\nCardLib âåðñ³¿ 1.0."
     IDS_SOL_QUIT    "Âèéòè ç ïîòî÷íî¿ ãðè?"
     IDS_SOL_WIN     "³òàííÿ, Âè âèãðàëè!!"
+    IDS_SOL_DEAL    "Deal again?"
 END
 
 

diff --git a/reactos/base/applications/games/solitaire/lang/zh-CN.rc b/reactos/base/applications/games/solitaire/lang/zh-CN.rc
index 4b76c35..c9e02d1 100644 (file)
--- a/reactos/base/applications/games/solitaire/lang/zh-CN.rc
+++ b/reactos/base/applications/games/solitaire/lang/zh-CN.rc
@@ -51,6 +51,7 @@ BEGIN
     IDS_SOL_ABOUT   "Solitaire by J Brown\n\nCardLib version 1.0."
     IDS_SOL_QUIT    "Quit the current game?"
     IDS_SOL_WIN     "Congratulations, you win!!"
+    IDS_SOL_DEAL    "Deal again?"
 END
 
 

diff --git a/reactos/base/applications/games/solitaire/resource.h b/reactos/base/applications/games/solitaire/resource.h
index 62bce42..9b5fa6c 100644 (file)
--- a/reactos/base/applications/games/solitaire/resource.h
+++ b/reactos/base/applications/games/solitaire/resource.h
@@ -31,3 +31,4 @@
 #define IDS_SOL_ABOUT                   1301
 #define IDS_SOL_QUIT                    1302
 #define IDS_SOL_WIN                     1303
+#define IDS_SOL_DEAL                    1304

diff --git a/reactos/base/applications/games/solitaire/solgame.cpp b/reactos/base/applications/games/solitaire/solgame.cpp
index 6b61783..d3b9774 100644 (file)
--- a/reactos/base/applications/games/solitaire/solgame.cpp
+++ b/reactos/base/applications/games/solitaire/solgame.cpp
@@ -14,6 +14,7 @@
 #endif
 
 extern TCHAR MsgWin[128];
+extern TCHAR MsgDeal[128];
 
 CardStack activepile;
 bool fGameStarted = false;
@@ -254,8 +255,19 @@ void CARDLIBPROC SuitStackAddProc(CardRegion &stackobj, const CardStack &added)
         {
             pSuitStack[i]->Flash(11, 100);
         }
-        fGameStarted = false;
+
+        if( IDYES == MessageBox(SolWnd, MsgDeal, szAppName, MB_YESNO | MB_ICONQUESTION) )
+        {
+            NewGame();
+        }
+        else
+        {
+            SolWnd.EmptyStacks();
+
+            fGameStarted = false;
+        }
     }
+
     TRACE("EXIT SuitStackAddProc()\n");
 }
 

diff --git a/reactos/base/applications/games/solitaire/solitaire.cpp b/reactos/base/applications/games/solitaire/solitaire.cpp
index a571b2c..d8a0c99 100644 (file)
--- a/reactos/base/applications/games/solitaire/solitaire.cpp
+++ b/reactos/base/applications/games/solitaire/solitaire.cpp
@@ -19,6 +19,7 @@ TCHAR szAppName[128];
 TCHAR MsgQuit[128];
 TCHAR MsgAbout[128];
 TCHAR MsgWin[128];
+TCHAR MsgDeal[128];
 DWORD dwOptions = 8;
 
 CardWindow SolWnd;
@@ -135,6 +136,7 @@ int WINAPI _tWinMain(HINSTANCE hInst, HINSTANCE hPrev, LPTSTR szCmdLine, int iCm
     LoadString(hInst, IDS_SOL_ABOUT, MsgAbout, sizeof(MsgAbout) / sizeof(MsgAbout[0]));
     LoadString(hInst, IDS_SOL_QUIT, MsgQuit, sizeof(MsgQuit) / sizeof(MsgQuit[0]));
     LoadString(hInst, IDS_SOL_WIN, MsgWin, sizeof(MsgWin) / sizeof(MsgWin[0]));
+    LoadString(hInst, IDS_SOL_DEAL, MsgDeal, sizeof(MsgDeal) / sizeof(MsgDeal[0]));
 
     //Window class for the main application parent window
     wndclass.style            = 0;//CS_HREDRAW | CS_VREDRAW;
@@ -579,3 +581,4 @@ LRESULT CALLBACK WndProc (HWND hwnd, UINT iMsg, WPARAM wParam, LPARAM lParam)
 }
 
 
+