From ca03cb86c0a721186361682fe658a7ece0a0b7a8 Mon Sep 17 00:00:00 2001
From: Wanne <Wanne@3b4a5df2-a311-0410-b5c6-a8a6f20db521>
Date: Thu, 5 Jun 2014 14:22:01 +0000
Subject: [PATCH] - Fixed compilation error in NON English builds

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7266 3b4a5df2-a311-0410-b5c6-a8a6f20db521
---
 Tactical/Overhead.cpp  | 12 ++----------
 Tactical/XML.h         |  2 +-
 Tactical/XML_Locks.cpp | 28 +++++-----------------------
 3 files changed, 8 insertions(+), 34 deletions(-)

diff --git a/Tactical/Overhead.cpp b/Tactical/Overhead.cpp
index 1887c4de..f17ce5b2 100644
--- a/Tactical/Overhead.cpp
+++ b/Tactical/Overhead.cpp
@@ -584,7 +584,7 @@ BOOLEAN InitTacticalEngine( )
 	if ( FileExists(fileName) )
 	{
 		DebugMsg (TOPIC_JA2,DBG_LEVEL_3,String("LoadExternalGameplayData, fileName = %s", fileName));
-		SGP_THROW_IFFALSE(ReadInLocks(fileName,FALSE), LOCKSFILENAME);
+		SGP_THROW_IFFALSE(ReadInLocks(fileName), LOCKSFILENAME);
 	}
 	else 
 	{
@@ -592,15 +592,7 @@ BOOLEAN InitTacticalEngine( )
 		if( !LoadLockTable() )
 			return(FALSE);
 	}
-#ifndef ENGLISH
-	AddLanguagePrefix(fileName);
-	if ( FileExists(fileName) )
-	{
-		DebugMsg (TOPIC_JA2,DBG_LEVEL_3,String("LoadExternalGameplayData, fileName = %s", fileName));
-		SGP_THROW_IFFALSE(ReadInLocks(fileName,TRUE), LOCKSFILENAME);
-	}
-#endif	
-	
+
 	strcpy(fileName, TABLEDATA_DIRECTORY);
 	strcat(fileName, KEYSFILENAME);
 	if ( FileExists(fileName) )
diff --git a/Tactical/XML.h b/Tactical/XML.h
index ad815732..d2fe61a2 100644
--- a/Tactical/XML.h
+++ b/Tactical/XML.h
@@ -498,7 +498,7 @@ extern BOOLEAN ReadInAdditionalTileProperties(STR fileName );
 extern BOOLEAN WriteAdditionalTileProperties( STR fileName );
 
 // anv: externalised locks and keys
-extern BOOLEAN ReadInLocks(STR fileName, BOOLEAN localizedVersion );
+extern BOOLEAN ReadInLocks(STR fileName );
 extern BOOLEAN WriteLocks( STR fileName );
 
 extern BOOLEAN ReadInKeys( STR fileName );
diff --git a/Tactical/XML_Locks.cpp b/Tactical/XML_Locks.cpp
index 74056a60..cf181061 100644
--- a/Tactical/XML_Locks.cpp
+++ b/Tactical/XML_Locks.cpp
@@ -25,8 +25,6 @@ struct
 }
 typedef lockParseData;
 
-BOOLEAN localizedTextOnly_Locks;
-
 UINT16 num_found_lock = 0;	// the correct number is set on reading the xml
 
 static void XMLCALL
@@ -46,9 +44,8 @@ lockStartElementHandle(void *userData, const XML_Char *name, const XML_Char **at
 		{
 			pData->curElement = ELEMENT;
 
-			if ( !localizedTextOnly_Locks )
-				memset(&pData->curLock,0,sizeof(LOCK));
-
+			memset(&pData->curLock,0,sizeof(LOCK));
+				
 			pData->maxReadDepth++; //we are not skipping this element
 		}
 		else if(pData->curElement == ELEMENT &&
@@ -100,21 +97,9 @@ lockEndElementHandle(void *userData, const XML_Char *name)
 			//if(pData->curLock.uiIndex < pData->maxArraySize)
 			if(num_found_lock < pData->maxArraySize)
 			{
-				if ( localizedTextOnly_Locks )
-				{			
-					//wcscpy(zTaunt[offset_index + pData->curLock.ubLockID].szText,pData->curLock.szText);
-					//wcscpy(zTaunt[offset_index + pData->curLock.ubLockID].szCensoredText,pData->curLock.szCensoredText);
-				}
-				else
-				{
-					pData->curArray[pData->curIndex] = pData->curLock;
-					//pData->curArray[num_found_lock-1] = pData->curLock;
-
-					num_found_lock++;
-				}
+				pData->curArray[pData->curIndex] = pData->curLock;
+				num_found_lock++;
 			}	
-			//num_found_lock++;
-			//num_found_lock = pData->curLock.uiIndex;
 		}
 		else if(strcmp(name, "ubLockID") == 0)
 		{
@@ -129,7 +114,6 @@ lockEndElementHandle(void *userData, const XML_Char *name)
 			pData->curElement = ELEMENT;
 			
 			strcpy( (CHAR8*)pData->curLock.ubEditorName, pData->szCharData );
-			//pData->curLock.ubEditorName[sizeof(pData->curLock.ubEditorName)/sizeof(pData->curLock.ubEditorName[0]) - 1] = '\0';
 		}
 		else if(strcmp(name, "usKeyItem") == 0)
 		{
@@ -157,7 +141,7 @@ lockEndElementHandle(void *userData, const XML_Char *name)
 	pData->currentDepth--;
 }
 
-BOOLEAN ReadInLocks(STR fileName, BOOLEAN localizedVersion)
+BOOLEAN ReadInLocks(STR fileName)
 {
 	HWFILE		hFile;
 	UINT32		uiBytesRead;
@@ -169,8 +153,6 @@ BOOLEAN ReadInLocks(STR fileName, BOOLEAN localizedVersion)
 
 	DebugMsg(TOPIC_JA2, DBG_LEVEL_3, "Loading Locks.xml" );
 
-	localizedTextOnly_Locks = localizedVersion;
-		
 	// Open file
 	hFile = FileOpen( fileName, FILE_ACCESS_READ, FALSE );
 	if ( !hFile )