1dot13/source
1
0
Fork 0
mirror of https://github.com/1dot13/source.git synced 2026-07-29 13:52:17 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merged from revision: 6846 and 6847

Browse Source 
- Fixed missing text entry in _FrenchText.cpp
- Bugfix: Fixed initialization not working for foreign language *.EnemyTaunts.xml

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6848 3b4a5df2-a311-0410-b5c6-a8a6f20db521
This commit is contained in:
Wanne
2014-01-29 20:32:04 +00:00
parent 72c4a77598
commit 64efff67fa
2 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Tactical/XML_Taunts.cpp
+9 -2
View File
@@ -232,10 +232,17 @@ tauntEndElementHandle(void *userData, const XML_Char *name)
{
if ( localizedTextOnly_Taunts )
{
// WANNE: Not working
/*
MultiByteToWideChar( CP_UTF8, 0, pData->szCharData, -1, pData->curArray[pData->curTaunt.uiIndex].szText, sizeof(pData->curTaunt.szText)/sizeof(pData->curTaunt.szText[0]) );
pData->curArray[pData->curTaunt.uiIndex].szText[sizeof(pData->curTaunt.szText)/sizeof(pData->curTaunt.szText[0]) - 1] = '\0';
pData->curTaunt.szText[sizeof(pData->curTaunt.szText)/sizeof(pData->curTaunt.szText[0]) - 1] = '\0';
MultiByteToWideChar( CP_UTF8, 0, pData->szCharData, -1, pData->curArray[pData->curTaunt.uiIndex].szCensoredText, sizeof(pData->curTaunt.szCensoredText)/sizeof(pData->curTaunt.szCensoredText[0]) );
pData->curArray[pData->curTaunt.uiIndex].szCensoredText[sizeof(pData->curTaunt.szCensoredText)/sizeof(pData->curTaunt.szCensoredText[0]) - 1] = '\0';
pData->curTaunt.szCensoredText[sizeof(pData->curTaunt.szCensoredText)/sizeof(pData->curTaunt.szCensoredText[0]) - 1] = '\0';
*/
// WANNE: Working
wcscpy(zTaunt[pData->curTaunt.uiIndex].szText,pData->curTaunt.szText);
wcscpy(zTaunt[pData->curTaunt.uiIndex].szCensoredText,pData->curTaunt.szCensoredText);
}
else
{
Utils/_FrenchText.cpp
+1
View File
@@ -6499,6 +6499,7 @@ STR16 New113Message[] =
L"Attention : Cadavre ennemi trouvé !!!",
L"%s [%d cart]\n%s %1.1f %s",
L"PA insuffisant ! Coût %d et vous avez %d.",
L"Hint: %s", // TODO.Translate
};
STR16 New113HAMMessage[] =