mirror of
https://github.com/reactos/reactos.git
synced 2025-07-30 18:52:10 +00:00
- 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 svn path=/trunk/; revision=37764
This commit is contained in:
Gregor Schneider
parent
32545494d9
commit
b0c0e3857d
23 changed files with 38 additions and 2 deletions
|
|
@ -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
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -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œ!"
|
||||
IDS_SOL_DEAL "Deal again?"
|
||||
END
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -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<C3A8> aktuálnu hru?"
|
||||
IDS_SOL_WIN "Blahoželám, vyhrali ste!"
|
||||
IDS_SOL_DEAL "Deal again?"
|
||||
END
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -31,3 +31,4 @@
|
|||
#define IDS_SOL_ABOUT 1301
|
||||
#define IDS_SOL_QUIT 1302
|
||||
#define IDS_SOL_WIN 1303
|
||||
#define IDS_SOL_DEAL 1304
|
||||
|
|
|
|||
|
|
@ -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");
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -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)
|
|||
}
|
||||
|
||||
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue