[ros-diffs] [gschneider] 37764: - Add dialog to deal cards again after winning solitaire, fixes the winning infinitely bug - 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
gschneider at svn.reactos.org
gschneider at svn.reactos.org
Sun Nov 30 13:09:37 CET 2008
Author: gschneider
Date: Sun Nov 30 06:09:36 2008
New Revision: 37764
URL: http://svn.reactos.org/svn/reactos?rev=37764&view=rev
Log:
- Add dialog to deal cards again after winning solitaire, fixes the winning infinitely bug
- 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
Modified:
trunk/reactos/base/applications/games/solitaire/lang/bg-BG.rc
trunk/reactos/base/applications/games/solitaire/lang/ca-ES.rc
trunk/reactos/base/applications/games/solitaire/lang/cs-CZ.rc
trunk/reactos/base/applications/games/solitaire/lang/de-DE.rc
trunk/reactos/base/applications/games/solitaire/lang/el-GR.rc
trunk/reactos/base/applications/games/solitaire/lang/en-US.rc
trunk/reactos/base/applications/games/solitaire/lang/es-ES.rc
trunk/reactos/base/applications/games/solitaire/lang/eu-ES.rc
trunk/reactos/base/applications/games/solitaire/lang/fr-FR.rc
trunk/reactos/base/applications/games/solitaire/lang/id-ID.rc
trunk/reactos/base/applications/games/solitaire/lang/it-IT.rc
trunk/reactos/base/applications/games/solitaire/lang/ko-KR.rc
trunk/reactos/base/applications/games/solitaire/lang/lt-LT.rc
trunk/reactos/base/applications/games/solitaire/lang/no-NO.rc
trunk/reactos/base/applications/games/solitaire/lang/pl-PL.rc
trunk/reactos/base/applications/games/solitaire/lang/ru-RU.rc
trunk/reactos/base/applications/games/solitaire/lang/sk-SK.rc
trunk/reactos/base/applications/games/solitaire/lang/th-TH.rc
trunk/reactos/base/applications/games/solitaire/lang/uk-UA.rc
trunk/reactos/base/applications/games/solitaire/lang/zh-CN.rc
trunk/reactos/base/applications/games/solitaire/resource.h
trunk/reactos/base/applications/games/solitaire/solgame.cpp
trunk/reactos/base/applications/games/solitaire/solitaire.cpp
Modified: trunk/reactos/base/applications/games/solitaire/lang/bg-BG.rc
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/solitaire/lang/bg-BG.rc?rev=37764&r1=37763&r2=37764&view=diff
==============================================================================
--- trunk/reactos/base/applications/games/solitaire/lang/bg-BG.rc [iso-8859-1] (original)
+++ trunk/reactos/base/applications/games/solitaire/lang/bg-BG.rc [iso-8859-1] Sun Nov 30 06:09:36 2008
@@ -50,6 +50,7 @@
IDS_SOL_ABOUT "Solitaire by J Brown\n\nCardLib version 1.0."
IDS_SOL_QUIT "Äà ïðåêðàòÿ ëè èãðàòà?"
IDS_SOL_WIN "Ïîçäðàâëåíèÿ, ïîáåäèõòå!!"
+ IDS_SOL_DEAL "Deal again?"
END
Modified: trunk/reactos/base/applications/games/solitaire/lang/ca-ES.rc
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/solitaire/lang/ca-ES.rc?rev=37764&r1=37763&r2=37764&view=diff
==============================================================================
--- trunk/reactos/base/applications/games/solitaire/lang/ca-ES.rc [iso-8859-1] (original)
+++ trunk/reactos/base/applications/games/solitaire/lang/ca-ES.rc [iso-8859-1] Sun Nov 30 06:09:36 2008
@@ -51,6 +51,7 @@
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
Modified: trunk/reactos/base/applications/games/solitaire/lang/cs-CZ.rc
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/solitaire/lang/cs-CZ.rc?rev=37764&r1=37763&r2=37764&view=diff
==============================================================================
--- trunk/reactos/base/applications/games/solitaire/lang/cs-CZ.rc [iso-8859-1] (original)
+++ trunk/reactos/base/applications/games/solitaire/lang/cs-CZ.rc [iso-8859-1] Sun Nov 30 06:09:36 2008
@@ -50,6 +50,7 @@
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
Modified: trunk/reactos/base/applications/games/solitaire/lang/de-DE.rc
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/solitaire/lang/de-DE.rc?rev=37764&r1=37763&r2=37764&view=diff
==============================================================================
--- trunk/reactos/base/applications/games/solitaire/lang/de-DE.rc [iso-8859-1] (original)
+++ trunk/reactos/base/applications/games/solitaire/lang/de-DE.rc [iso-8859-1] Sun Nov 30 06:09:36 2008
@@ -50,6 +50,7 @@
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
Modified: trunk/reactos/base/applications/games/solitaire/lang/el-GR.rc
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/solitaire/lang/el-GR.rc?rev=37764&r1=37763&r2=37764&view=diff
==============================================================================
--- trunk/reactos/base/applications/games/solitaire/lang/el-GR.rc [iso-8859-1] (original)
+++ trunk/reactos/base/applications/games/solitaire/lang/el-GR.rc [iso-8859-1] Sun Nov 30 06:09:36 2008
@@ -50,6 +50,7 @@
IDS_SOL_ABOUT "Solitaire by J Brown\n\nCardLib version 1.0."
IDS_SOL_QUIT "Ôåñìáôéóìüò ôïõ ðéá÷íéäéïý áõôïý;"
IDS_SOL_WIN "Óõã÷áñçôÞñéá, êåñäßóáôå!!"
+ IDS_SOL_DEAL "Deal again?"
END
Modified: trunk/reactos/base/applications/games/solitaire/lang/en-US.rc
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/solitaire/lang/en-US.rc?rev=37764&r1=37763&r2=37764&view=diff
==============================================================================
--- trunk/reactos/base/applications/games/solitaire/lang/en-US.rc [iso-8859-1] (original)
+++ trunk/reactos/base/applications/games/solitaire/lang/en-US.rc [iso-8859-1] Sun Nov 30 06:09:36 2008
@@ -50,7 +50,8 @@
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
Modified: trunk/reactos/base/applications/games/solitaire/lang/es-ES.rc
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/solitaire/lang/es-ES.rc?rev=37764&r1=37763&r2=37764&view=diff
==============================================================================
--- trunk/reactos/base/applications/games/solitaire/lang/es-ES.rc [iso-8859-1] (original)
+++ trunk/reactos/base/applications/games/solitaire/lang/es-ES.rc [iso-8859-1] Sun Nov 30 06:09:36 2008
@@ -51,6 +51,7 @@
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
Modified: trunk/reactos/base/applications/games/solitaire/lang/eu-ES.rc
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/solitaire/lang/eu-ES.rc?rev=37764&r1=37763&r2=37764&view=diff
==============================================================================
--- trunk/reactos/base/applications/games/solitaire/lang/eu-ES.rc [iso-8859-1] (original)
+++ trunk/reactos/base/applications/games/solitaire/lang/eu-ES.rc [iso-8859-1] Sun Nov 30 06:09:36 2008
@@ -50,6 +50,7 @@
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
Modified: trunk/reactos/base/applications/games/solitaire/lang/fr-FR.rc
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/solitaire/lang/fr-FR.rc?rev=37764&r1=37763&r2=37764&view=diff
==============================================================================
--- trunk/reactos/base/applications/games/solitaire/lang/fr-FR.rc [iso-8859-1] (original)
+++ trunk/reactos/base/applications/games/solitaire/lang/fr-FR.rc [iso-8859-1] Sun Nov 30 06:09:36 2008
@@ -50,6 +50,7 @@
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
Modified: trunk/reactos/base/applications/games/solitaire/lang/id-ID.rc
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/solitaire/lang/id-ID.rc?rev=37764&r1=37763&r2=37764&view=diff
==============================================================================
--- trunk/reactos/base/applications/games/solitaire/lang/id-ID.rc [iso-8859-1] (original)
+++ trunk/reactos/base/applications/games/solitaire/lang/id-ID.rc [iso-8859-1] Sun Nov 30 06:09:36 2008
@@ -51,6 +51,7 @@
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
Modified: trunk/reactos/base/applications/games/solitaire/lang/it-IT.rc
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/solitaire/lang/it-IT.rc?rev=37764&r1=37763&r2=37764&view=diff
==============================================================================
--- trunk/reactos/base/applications/games/solitaire/lang/it-IT.rc [iso-8859-1] (original)
+++ trunk/reactos/base/applications/games/solitaire/lang/it-IT.rc [iso-8859-1] Sun Nov 30 06:09:36 2008
@@ -51,6 +51,7 @@
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
Modified: trunk/reactos/base/applications/games/solitaire/lang/ko-KR.rc
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/solitaire/lang/ko-KR.rc?rev=37764&r1=37763&r2=37764&view=diff
==============================================================================
--- trunk/reactos/base/applications/games/solitaire/lang/ko-KR.rc [iso-8859-1] (original)
+++ trunk/reactos/base/applications/games/solitaire/lang/ko-KR.rc [iso-8859-1] Sun Nov 30 06:09:36 2008
@@ -47,6 +47,7 @@
IDS_SOL_ABOUT "Solitaire by J Brown\n\nCardLib version 1.0."
IDS_SOL_QUIT "ÇöÀç °ÔÀÓÀ» ³¡³¾°¡¿ä?"
IDS_SOL_WIN "ÃàÇÏÇÕ´Ï´Ù!!"
+ IDS_SOL_DEAL "Deal again?"
END
Modified: trunk/reactos/base/applications/games/solitaire/lang/lt-LT.rc
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/solitaire/lang/lt-LT.rc?rev=37764&r1=37763&r2=37764&view=diff
==============================================================================
--- trunk/reactos/base/applications/games/solitaire/lang/lt-LT.rc [iso-8859-1] (original)
+++ trunk/reactos/base/applications/games/solitaire/lang/lt-LT.rc [iso-8859-1] Sun Nov 30 06:09:36 2008
@@ -52,6 +52,7 @@
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
Modified: trunk/reactos/base/applications/games/solitaire/lang/no-NO.rc
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/solitaire/lang/no-NO.rc?rev=37764&r1=37763&r2=37764&view=diff
==============================================================================
--- trunk/reactos/base/applications/games/solitaire/lang/no-NO.rc [iso-8859-1] (original)
+++ trunk/reactos/base/applications/games/solitaire/lang/no-NO.rc [iso-8859-1] Sun Nov 30 06:09:36 2008
@@ -51,6 +51,7 @@
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
Modified: trunk/reactos/base/applications/games/solitaire/lang/pl-PL.rc
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/solitaire/lang/pl-PL.rc?rev=37764&r1=37763&r2=37764&view=diff
==============================================================================
--- trunk/reactos/base/applications/games/solitaire/lang/pl-PL.rc [iso-8859-1] (original)
+++ trunk/reactos/base/applications/games/solitaire/lang/pl-PL.rc [iso-8859-1] Sun Nov 30 06:09:36 2008
@@ -49,6 +49,7 @@
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œ!"
+ IDS_SOL_DEAL "Deal again?"
END
Modified: trunk/reactos/base/applications/games/solitaire/lang/ru-RU.rc
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/solitaire/lang/ru-RU.rc?rev=37764&r1=37763&r2=37764&view=diff
==============================================================================
--- trunk/reactos/base/applications/games/solitaire/lang/ru-RU.rc [iso-8859-1] (original)
+++ trunk/reactos/base/applications/games/solitaire/lang/ru-RU.rc [iso-8859-1] Sun Nov 30 06:09:36 2008
@@ -44,6 +44,7 @@
IDS_SOL_ABOUT "Ïàñüÿíñ îò J Brown\n\nCardLib âåðñèè 1.0."
IDS_SOL_QUIT "Çàêîí÷èòü òåêóùóþ èãðó?"
IDS_SOL_WIN "Congratulations, you win!!"
+ IDS_SOL_DEAL "Deal again?"
END
Modified: trunk/reactos/base/applications/games/solitaire/lang/sk-SK.rc
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/solitaire/lang/sk-SK.rc?rev=37764&r1=37763&r2=37764&view=diff
==============================================================================
--- trunk/reactos/base/applications/games/solitaire/lang/sk-SK.rc [iso-8859-1] (original)
+++ trunk/reactos/base/applications/games/solitaire/lang/sk-SK.rc [iso-8859-1] Sun Nov 30 06:09:36 2008
@@ -52,6 +52,7 @@
IDS_SOL_ABOUT "Solitér od J Brown\n\nCardLib verzia 1.0"
IDS_SOL_QUIT "Naozaj chcete skonèi aktuálnu hru?"
IDS_SOL_WIN "Blahoželám, vyhrali ste!"
+ IDS_SOL_DEAL "Deal again?"
END
Modified: trunk/reactos/base/applications/games/solitaire/lang/th-TH.rc
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/solitaire/lang/th-TH.rc?rev=37764&r1=37763&r2=37764&view=diff
==============================================================================
--- trunk/reactos/base/applications/games/solitaire/lang/th-TH.rc [iso-8859-1] (original)
+++ trunk/reactos/base/applications/games/solitaire/lang/th-TH.rc [iso-8859-1] Sun Nov 30 06:09:36 2008
@@ -51,6 +51,7 @@
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
Modified: trunk/reactos/base/applications/games/solitaire/lang/uk-UA.rc
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/solitaire/lang/uk-UA.rc?rev=37764&r1=37763&r2=37764&view=diff
==============================================================================
--- trunk/reactos/base/applications/games/solitaire/lang/uk-UA.rc [iso-8859-1] (original)
+++ trunk/reactos/base/applications/games/solitaire/lang/uk-UA.rc [iso-8859-1] Sun Nov 30 06:09:36 2008
@@ -50,6 +50,7 @@
IDS_SOL_ABOUT "Êîñèíêà â³ä J Brown\n\nCardLib âåðñ³¿ 1.0."
IDS_SOL_QUIT "Âèéòè ç ïîòî÷íî¿ ãðè?"
IDS_SOL_WIN "³òàííÿ, Âè âèãðàëè!!"
+ IDS_SOL_DEAL "Deal again?"
END
Modified: trunk/reactos/base/applications/games/solitaire/lang/zh-CN.rc
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/solitaire/lang/zh-CN.rc?rev=37764&r1=37763&r2=37764&view=diff
==============================================================================
--- trunk/reactos/base/applications/games/solitaire/lang/zh-CN.rc [iso-8859-1] (original)
+++ trunk/reactos/base/applications/games/solitaire/lang/zh-CN.rc [iso-8859-1] Sun Nov 30 06:09:36 2008
@@ -51,6 +51,7 @@
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
Modified: trunk/reactos/base/applications/games/solitaire/resource.h
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/solitaire/resource.h?rev=37764&r1=37763&r2=37764&view=diff
==============================================================================
--- trunk/reactos/base/applications/games/solitaire/resource.h [iso-8859-1] (original)
+++ trunk/reactos/base/applications/games/solitaire/resource.h [iso-8859-1] Sun Nov 30 06:09:36 2008
@@ -31,3 +31,4 @@
#define IDS_SOL_ABOUT 1301
#define IDS_SOL_QUIT 1302
#define IDS_SOL_WIN 1303
+#define IDS_SOL_DEAL 1304
Modified: trunk/reactos/base/applications/games/solitaire/solgame.cpp
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/solitaire/solgame.cpp?rev=37764&r1=37763&r2=37764&view=diff
==============================================================================
--- trunk/reactos/base/applications/games/solitaire/solgame.cpp [iso-8859-1] (original)
+++ trunk/reactos/base/applications/games/solitaire/solgame.cpp [iso-8859-1] Sun Nov 30 06:09:36 2008
@@ -14,6 +14,7 @@
#endif
extern TCHAR MsgWin[128];
+extern TCHAR MsgDeal[128];
CardStack activepile;
bool fGameStarted = false;
@@ -254,8 +255,19 @@
{
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");
}
Modified: trunk/reactos/base/applications/games/solitaire/solitaire.cpp
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/solitaire/solitaire.cpp?rev=37764&r1=37763&r2=37764&view=diff
==============================================================================
--- trunk/reactos/base/applications/games/solitaire/solitaire.cpp [iso-8859-1] (original)
+++ trunk/reactos/base/applications/games/solitaire/solitaire.cpp [iso-8859-1] Sun Nov 30 06:09:36 2008
@@ -19,6 +19,7 @@
TCHAR MsgQuit[128];
TCHAR MsgAbout[128];
TCHAR MsgWin[128];
+TCHAR MsgDeal[128];
DWORD dwOptions = 8;
CardWindow SolWnd;
@@ -135,6 +136,7 @@
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 @@
}
+
More information about the Ros-diffs
mailing list