From e3dd3f5487cfd127d772230a3688ab2effe970f9 Mon Sep 17 00:00:00 2001
From: Wanne <Wanne@3b4a5df2-a311-0410-b5c6-a8a6f20db521>
Date: Mon, 18 Aug 2008 12:49:34 +0000
Subject: [PATCH] First step in making the Cities.xml useable with other
 languages (Russian.Cities.xml, ...)

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2311 3b4a5df2-a311-0410-b5c6-a8a6f20db521
---
 Init.cpp                   | 14 ++++++++++++--
 Strategic/strategicmap.cpp | 14 +++++++++++++-
 Strategic/strategicmap.h   |  2 +-
 3 files changed, 26 insertions(+), 4 deletions(-)

diff --git a/Init.cpp b/Init.cpp
index 2be1adec..38c87266 100644
--- a/Init.cpp
+++ b/Init.cpp
@@ -574,7 +574,7 @@ BOOLEAN LoadExternalGameplayData(STR directoryName)
 
 	strcpy(fileName, directoryName);
 	strcat(fileName, CITYTABLEFILENAME);
-	if(!ReadInMapStructure(fileName))
+	if(!ReadInMapStructure(fileName, FALSE))
 		return FALSE;
 
 #ifdef RUSSIAN 
@@ -582,7 +582,17 @@ BOOLEAN LoadExternalGameplayData(STR directoryName)
 	if ( FileExists(fileName) )
 	{
 		DebugMsg (TOPIC_JA2,DBG_LEVEL_3,String("LoadExternalGameplayData, fileName = %s", fileName));
-		if(!ReadInMapStructure(fileName))
+		if(!ReadInMapStructure(fileName, TRUE))
+			return FALSE;
+	}
+#endif
+
+#ifdef GERMAN 
+	AddLanguagePrefix( fileName, GERMAN_PREFIX);
+	if ( FileExists(fileName) )
+	{
+		DebugMsg (TOPIC_JA2,DBG_LEVEL_3,String("LoadExternalGameplayData, fileName = %s", fileName));
+		if(!ReadInMapStructure(fileName, TRUE))
 			return FALSE;
 	}
 #endif
diff --git a/Strategic/strategicmap.cpp b/Strategic/strategicmap.cpp
index 24db867b..5db036de 100644
--- a/Strategic/strategicmap.cpp
+++ b/Strategic/strategicmap.cpp
@@ -314,6 +314,8 @@ extern STR16 pBullseyeStrings[];
 
 extern void HandleRPCDescription( );
 
+BOOLEAN locTextOnly;
+
 
 #ifdef CRIPPLED_VERSION
 void CrippledVersionFailureToLoadMapCallBack( UINT8 bExitValue );
@@ -808,6 +810,10 @@ typedef struct
 
 	CHAR8					szCharData[MAX_CHAR_DATA_LENGTH+1];
 	cityInfo				curCityInfo;
+	
+	//cityInfo *				curArray;	// ROMAN: added
+	//UINT32					maxArraySize;	// ROMAN: added
+
 	UINT32					uiRowNumber;
 	UINT32					uiHighestIndex;
 
@@ -1186,6 +1192,10 @@ BOOLEAN ReadInStrategicMapSectorTownNames(STR fileName)
 
 
 	memset(&pData,0,sizeof(pData));
+
+	// TODO: ROMAN
+	//pData.curCityInfo
+
 	NUM_TOWNS = 0;
 	XML_SetUserData(parser, &pData);
 
@@ -1208,10 +1218,12 @@ BOOLEAN ReadInStrategicMapSectorTownNames(STR fileName)
 	return TRUE;
 }
 
-BOOLEAN ReadInMapStructure(STR fileName)
+BOOLEAN ReadInMapStructure(STR fileName, BOOLEAN localizedVersion)
 {
 	memset(StrategicMap, 0, sizeof(StrategicMap));
 
+	locTextOnly = localizedVersion;
+
 	return ReadInStrategicMapSectorTownNames(fileName);
 }
 
diff --git a/Strategic/strategicmap.h b/Strategic/strategicmap.h
index 05a80dec..c6162a26 100644
--- a/Strategic/strategicmap.h
+++ b/Strategic/strategicmap.h
@@ -81,7 +81,7 @@ BOOLEAN EnterSector( INT16 sSectorX, INT16 sSectorY, INT8 bSectorZ );
 void UpdateMercsInSector( INT16 sSectorX, INT16 sSectorY, INT8 bSectorZ );
 void UpdateMercInSector( SOLDIERTYPE *pSoldier, INT16 sSectorX, INT16 sSectorY, INT8 bSectorZ );
 
-BOOLEAN ReadInMapStructure(STR fileName);
+BOOLEAN ReadInMapStructure(STR fileName, BOOLEAN localizedVersion);
 BOOLEAN ReadInStrategicMapSectorTownNames(STR fileName);
 BOOLEAN WriteInStrategicMapSectorTownNames(STR fileName);