ShuriZma
/
project64
mirror of https://github.com/project64/project64.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Add white space in multilanguage files

This commit is contained in:
Ryan Collins 2015-03-25 16:52:34 -04:00
parent 90b84ab632
commit b6181d5fe5
1 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
Source/Project64/Multilanguage/Language Class.cpp
View File

@ -542,7 +542,7 @@ void CLanguage::LoadCurrentStrings ( bool ShowSelectDialog )
} }
//String; //String;
while(!feof(file)) while (!feof(file))
{ {
m_CurrentStrings.insert(GetNextLangString(file)); m_CurrentStrings.insert(GetNextLangString(file));
} }
@ -606,14 +606,14 @@ DWORD CALLBACK LangSelectOkProc (HWND hWnd, DWORD uMsg, DWORD wParam, DWORD lPar
} }
break; break;
case WM_MOUSEMOVE: case WM_MOUSEMOVE:
if(::GetCapture() == hWnd) if (::GetCapture() == hWnd)
{ {
POINT ptCursor = { ((int)(short)LOWORD(lParam)), ((int)(short)HIWORD(lParam)) }; POINT ptCursor = { ((int)(short)LOWORD(lParam)), ((int)(short)HIWORD(lParam)) };
ClientToScreen(hWnd, &ptCursor); ClientToScreen(hWnd, &ptCursor);
RECT rect; RECT rect;
GetWindowRect(hWnd, &rect); GetWindowRect(hWnd, &rect);
bool uPressed = ::PtInRect(&rect, ptCursor)==TRUE; bool uPressed = ::PtInRect(&rect, ptCursor)==TRUE;
if( m_fPressed != uPressed ) if ( m_fPressed != uPressed )
{ {
m_fPressed = uPressed; m_fPressed = uPressed;
::InvalidateRect(hWnd, NULL, TRUE); ::InvalidateRect(hWnd, NULL, TRUE);
@ -626,7 +626,7 @@ DWORD CALLBACK LangSelectOkProc (HWND hWnd, DWORD uMsg, DWORD wParam, DWORD lPar
LRESULT lRet = 0; LRESULT lRet = 0;
lRet = DefWindowProc(hWnd, uMsg, wParam, lParam); lRet = DefWindowProc(hWnd, uMsg, wParam, lParam);
SetCapture(hWnd); SetCapture(hWnd);
if( ::GetCapture()==hWnd ) if ( ::GetCapture()==hWnd )
{ {
m_fPressed = true; m_fPressed = true;
@ -643,10 +643,10 @@ DWORD CALLBACK LangSelectOkProc (HWND hWnd, DWORD uMsg, DWORD wParam, DWORD lPar
{ {
LRESULT lRet = 0; LRESULT lRet = 0;
lRet = DefWindowProc(hWnd, uMsg, wParam, lParam); lRet = DefWindowProc(hWnd, uMsg, wParam, lParam);
if(::GetCapture() == hWnd ) if ( ::GetCapture() == hWnd )
{ {
::ReleaseCapture(); ::ReleaseCapture();
if( m_fPressed ) if ( m_fPressed )
{ {
::SendMessage(GetParent(hWnd), WM_COMMAND, MAKEWPARAM(GetDlgCtrlID(hWnd), BN_CLICKED), (LPARAM)hWnd); ::SendMessage(GetParent(hWnd), WM_COMMAND, MAKEWPARAM(GetDlgCtrlID(hWnd), BN_CLICKED), (LPARAM)hWnd);
} }
@ -952,7 +952,7 @@ std::wstring CLanguage::GetLangString ( const char * FileName, LanguageStringID
} }
//String; //String;
while(!feof(file)) while (!feof(file))
{ {
LANG_STR String = GetNextLangString(file); LANG_STR String = GetNextLangString(file);
if (String.first == ID) if (String.first == ID)
@ -974,18 +974,18 @@ LANG_STR CLanguage::GetNextLangString (void * OpenFile)
FILE * file = (FILE *)OpenFile; FILE * file = (FILE *)OpenFile;
//while(token!='#' && !feof(file)) { fread(&token, 1, 1, file); } //while(token!='#' && !feof(file)) { fread(&token, 1, 1, file); }
if(feof(file)) if (feof(file))
{ {
return LANG_STR(0,L""); return LANG_STR(0,L"");
} }
//Search for token # //Search for token #
char token=0; char token=0;
while(token!='#' && !feof(file)) while (token!='#' && !feof(file))
{ {
fread(&token, 1, 1, file); fread(&token, 1, 1, file);
} }
if(feof(file)) if (feof(file))
{ {
return LANG_STR(0,L""); return LANG_STR(0,L"");
} }
@ -998,24 +998,24 @@ LANG_STR CLanguage::GetNextLangString (void * OpenFile)
{ {
fread(&token, 1, 1, file); fread(&token, 1, 1, file);
} }
if(feof(file)) if (feof(file))
{ {
StringID = EMPTY_STRING; return LANG_STR(0,L""); StringID = EMPTY_STRING; return LANG_STR(0,L"");
} }
//Search for start of string '"' //Search for start of string '"'
while(token!='"' && !feof(file)) while (token!='"' && !feof(file))
{ {
fread(&token, 1, 1, file); fread(&token, 1, 1, file);
} }
if(feof(file)) if (feof(file))
{ {
StringID = EMPTY_STRING; return LANG_STR(0,L""); StringID = EMPTY_STRING; return LANG_STR(0,L"");
} }
int pos = 0; int pos = 0;
fread(&token, 1, 1, file); fread(&token, 1, 1, file);
while(token!='"' && !feof(file)) while (token!='"' && !feof(file))
{ {
szString[pos++] = token; szString[pos++] = token;
fread(&token, 1, 1, file); fread(&token, 1, 1, file);