From 64efff67fae6df102d5f5b954623bb42da66891d Mon Sep 17 00:00:00 2001
From: Wanne <Wanne@3b4a5df2-a311-0410-b5c6-a8a6f20db521>
Date: Wed, 29 Jan 2014 20:32:04 +0000
Subject: [PATCH] Merged from revision: 6846 and 6847 - 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
---
 Tactical/XML_Taunts.cpp | 11 +++++++++--
 Utils/_FrenchText.cpp   |  1 +
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/Tactical/XML_Taunts.cpp b/Tactical/XML_Taunts.cpp
index 3c1dcdf03..041f9fd35 100644
--- a/Tactical/XML_Taunts.cpp
+++ b/Tactical/XML_Taunts.cpp
@@ -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
 				{
diff --git a/Utils/_FrenchText.cpp b/Utils/_FrenchText.cpp
index a6bb28f34..2e79b5007 100644
--- a/Utils/_FrenchText.cpp
+++ b/Utils/_FrenchText.cpp
@@ -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[] =