patch from Pierre Schweitzer (aka Heis Spiter) heis_spiter at hotmail dor com

------------------------------------------------------------------------------
1. remove one hard code line.
2. cleanup one rc file


See issue #2400 for more details.

svn path=/trunk/; revision=27627
This commit is contained in:
Magnus Olsen 2007-07-13 11:42:20 +00:00
parent 062ffc428c
commit 846d92706e
17 changed files with 42 additions and 89 deletions

View file

@ -37,6 +37,7 @@ BEGIN
IDS_SOL_NAME "Ïàñèàíñ"
IDS_SOL_ABOUT "Solitaire by J Brown\n\nCardLib version 1.0."
IDS_SOL_QUIT "Äà ïðåêðàòÿ ëè òåêóùàòà èãðà?"
IDS_SOL_WIN "Congratulations, you win!!"
END

View file

@ -37,6 +37,7 @@ BEGIN
IDS_SOL_NAME "Solitär"
IDS_SOL_ABOUT "Solitär von J Brown\n\nCardLib version 1.0."
IDS_SOL_QUIT "Laufendes Spiel beenden?"
IDS_SOL_WIN "Congratulations, you win!!"
END

View file

@ -37,6 +37,7 @@ 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!!"
END

View file

@ -37,6 +37,7 @@ 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!!"
END

View file

@ -37,6 +37,7 @@ BEGIN
IDS_SOL_NAME "Solitaire"
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é !"
END

View file

@ -38,6 +38,7 @@ 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!!"
END

View file

@ -38,6 +38,7 @@ BEGIN
IDS_SOL_NAME "Solitario"
IDS_SOL_ABOUT "Solitario by J Brown\n\nCardLib versione 1.0."
IDS_SOL_QUIT "Chiudere la partita in corso?"
IDS_SOL_WIN "Congratulations, you win!!"
END

View file

@ -38,6 +38,7 @@ 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!!"
END

View file

@ -36,6 +36,7 @@ BEGIN
IDS_SOL_NAME "Pasjans"
IDS_SOL_ABOUT "Solitaire by J Brown\n\nCardLib version 1.0."
IDS_SOL_QUIT "Zakoñczyæ aktualn¹ grê?"
IDS_SOL_WIN "Congratulations, you win!!"
END

View file

@ -32,6 +32,7 @@ BEGIN
IDS_SOL_NAME "Ïàñüÿíñ"
IDS_SOL_ABOUT "Ïàñüÿíñ îò J Brown\n\nCardLib âåðñèè 1.0."
IDS_SOL_QUIT "Çàêîí÷èòü òåêóùóþ èãðó?"
IDS_SOL_WIN "Congratulations, you win!!"
END

View file

@ -1,86 +1,44 @@
//Microsoft Developer Studio generated resource script.
//
// Slovak translation by Kario 2007 <kario@szm.sk>
#include "resource.h"
#define APSTUDIO_READONLY_SYMBOLS
/////////////////////////////////////////////////////////////////////////////
//
// Generated from the TEXTINCLUDE 2 resource.
//
/* winemaker: #include "afxres.h" */
/* winemaker:warning: 'afxres.h' is an MFC specific header. Replacing it with 'winres.h' */
#include "winres.h"
/////////////////////////////////////////////////////////////////////////////
#undef APSTUDIO_READONLY_SYMBOLS
/////////////////////////////////////////////////////////////////////////////
// Slovak translation by Kario 2007 <kario@szm.sk>
#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENG)
#ifdef _WIN32
LANGUAGE LANG_SLOVAK, SUBLANG_DEFAULT
#pragma code_page(1250)
#endif //_WIN32
/////////////////////////////////////////////////////////////////////////////
//
// Dialog
//
IDD_DIALOG1 DIALOG DISCARDABLE 0, 0, 186, 95
IDD_OPTIONS DIALOGEX DISCARDABLE 0, 0, 186, 118
STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
CAPTION "Dialog"
FONT 8, "MS Sans Serif"
CAPTION "Options"
FONT 8, "MS Shell Dlg"
EXSTYLE DS_SHELLFONT
BEGIN
DEFPUSHBUTTON "OK",IDOK,129,7,50,14
PUSHBUTTON "Zruši<C5A1>",IDCANCEL,129,24,50,14
GROUPBOX "Cards", -1, 7, 7, 65, 40
AUTORADIOBUTTON "Draw &One", IDC_OPT_DRAWONE, 14, 19, 52, 10, WS_GROUP | WS_TABSTOP
AUTORADIOBUTTON "Draw &Three", IDC_OPT_DRAWTHREE, 14, 32, 52, 10
AUTOCHECKBOX "&Show Time", IDC_OPT_SHOWTIME, 7 ,51 ,65 ,10, WS_TABSTOP
AUTOCHECKBOX "S&tatus bar", IDC_OPT_STATUSBAR, 7, 66, 64, 10, WS_TABSTOP
DEFPUSHBUTTON "OK", IDOK, 35, 97, 50, 14
PUSHBUTTON "Zruši<C5A1>»", IDCANCEL, 101, 97, 50, 14
END
/////////////////////////////////////////////////////////////////////////////
//
// DESIGNINFO
// Strings
//
#ifdef APSTUDIO_INVOKED
GUIDELINES DESIGNINFO DISCARDABLE
STRINGTABLE
BEGIN
IDD_DIALOG1, DIALOG
BEGIN
LEFTMARGIN, 7
RIGHTMARGIN, 179
TOPMARGIN, 7
BOTTOMMARGIN, 88
END
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!!"
END
#endif // APSTUDIO_INVOKED
#ifdef APSTUDIO_INVOKED
/////////////////////////////////////////////////////////////////////////////
//
// TEXTINCLUDE
//
1 TEXTINCLUDE DISCARDABLE
BEGIN
"resource.h\0"
END
2 TEXTINCLUDE DISCARDABLE
BEGIN
"#include ""winres.h""\r\n"
"\0"
END
3 TEXTINCLUDE DISCARDABLE
BEGIN
"\r\n"
"\0"
END
#endif // APSTUDIO_INVOKED
/////////////////////////////////////////////////////////////////////////////
@ -118,27 +76,3 @@ BEGIN
VK_F2, IDM_GAME_NEW, VIRTKEY, NOINVERT
END
/////////////////////////////////////////////////////////////////////////////
//
// Icon
//
// Icon with lowest ID value placed first to ensure application icon
// remains consistent on all systems.
IDI_ICON1 ICON DISCARDABLE "solitaire.ico"
#endif // Slovak resources
/////////////////////////////////////////////////////////////////////////////
#ifndef APSTUDIO_INVOKED
/////////////////////////////////////////////////////////////////////////////
//
// Generated from the TEXTINCLUDE 3 resource.
//
/////////////////////////////////////////////////////////////////////////////
#endif // not APSTUDIO_INVOKED

View file

@ -38,6 +38,7 @@ 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!!"
END

View file

@ -37,6 +37,7 @@ 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!!"
END

View file

@ -38,6 +38,7 @@ 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!!"
END

View file

@ -25,3 +25,4 @@
#define IDS_SOL_NAME 1300
#define IDS_SOL_ABOUT 1301
#define IDS_SOL_QUIT 1302
#define IDS_SOL_WIN 1303

View file

@ -13,6 +13,8 @@
#define TRACE(s) printf("%s(%i): %s",__FILE__,__LINE__,s)
#endif
extern TCHAR MsgWin[128];
CardStack activepile;
bool fGameStarted = false;
@ -240,7 +242,7 @@ void CARDLIBPROC SuitStackAddProc(CardRegion &stackobj, const CardStack &added)
if(fGameOver)
{
MessageBox(SolWnd, _T("Congratulations, you win!!"), szAppName, MB_OK | MB_ICONINFORMATION);
MessageBox(SolWnd, MsgWin, szAppName, MB_OK | MB_ICONINFORMATION);
for(int i = 0; i < 4; i++)
{

View file

@ -18,6 +18,7 @@ HINSTANCE hInstance;
TCHAR szAppName[128];
TCHAR MsgQuit[128];
TCHAR MsgAbout[128];
TCHAR MsgWin[128];
INT nOptions = 8;
CardWindow SolWnd;
@ -53,9 +54,10 @@ int WINAPI WinMain (HINSTANCE hInst, HINSTANCE hPrev, PSTR szCmdLine, int iCmdSh
// Load application title
LoadString(hInst, IDS_SOL_NAME, szAppName, sizeof(szAppName) / sizeof(szAppName[0]));
// Load MsgBox() text here to avoid loading it many times later
// Load MsgBox() texts here to avoid loading them many times later
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]));
//Window class for the main application parent window
wndclass.cbSize = sizeof(wndclass);
@ -266,3 +268,4 @@ LRESULT CALLBACK WndProc (HWND hwnd, UINT iMsg, WPARAM wParam, LPARAM lParam)
return DefWindowProc (hwnd, iMsg, wParam, lParam);
}