diff --git a/reactos/base/applications/games/solitaire/lang/bg-BG.rc b/reactos/base/applications/games/solitaire/lang/bg-BG.rc index a77754a2456..31f802846bc 100644 --- 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 ed718ba7311..af19d6bf189 100644 --- 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 a59be5d660e..cd203121943 100644 --- 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 "Ukonit rozehranou hru?" IDS_SOL_WIN "Gratulujeme, zvtzili 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 796d392a063..516812741cc 100644 --- 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 "Solitr von J Brown\n\nCardLib version 1.0." IDS_SOL_QUIT "Laufendes Spiel beenden?" IDS_SOL_WIN "Glckwunsch, 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 9bc7e906ec6..60c9d2091b4 100644 --- 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 29da55618eb..7b6e1cbdb92 100644 --- 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 3146431cd66..e7ab8b5e7d0 100644 --- 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 f88888968e7..5d9166923ea 100644 --- 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 b63d69cec38..cd1d7cbdd0f 100644 --- 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 "Flicitations ! 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 b750371acb7..0516ca719f5 100644 --- 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 ccc753bf221..ed3eefc145d 100644 --- 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 943d90171c4..b557862a34f 100644 --- 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 c820d9316d2..6aeffb7f006 100644 --- 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, js laimjote!!" + 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 8eea320beb7..6eb2265d540 100644 --- 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 nvrende 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 eef19cb8caa..ebd698cdd54 100644 --- 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 "Zakoczy aktualn gr?" IDS_SOL_WIN "Gratulacje, wygrae!" + 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 b67b8bff737..97c24ce2761 100644 --- 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 9913ec23b62..7a7aeb00298 100644 --- 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 "Solitr od J Brown\n\nCardLib verzia 1.0" IDS_SOL_QUIT "Naozaj chcete skoni aktulnu hru?" IDS_SOL_WIN "Blahoelm, 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 965e496aa6b..77abd0f8d01 100644 --- 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 17f54c5739c..5cbaa0e9fba 100644 --- 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 4b76c35f09a..c9e02d13dc0 100644 --- 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 62bce4264b9..9b5fa6c5f3b 100644 --- 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 6b61783d6c0..d3b9774b5db 100644 --- 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 a571b2c7888..d8a0c993430 100644 --- 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) } +