- Improved init code of language specific xml files

o When the xml file contains an error an error is shown to the user instead of ignoring it

- Shortened text in _FrenchText.cpp

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@4763 3b4a5df2-a311-0410-b5c6-a8a6f20db521

Init.cpp

@@ -316,8 +316,7 @@ BOOLEAN LoadExternalGameplayData(STR directoryName)
 	if ( FileExists(fileName) )
 	{
 		DebugMsg (TOPIC_JA2,DBG_LEVEL_3,String("LoadExternalGameplayData, fileName = %s", fileName));
-		if(!ReadInItemStats(fileName,TRUE))
+		SGP_THROW_IFFALSE(ReadInItemStats(fileName,TRUE), fileName);
-			return FALSE;
 	}
 #endif
 
@@ -386,8 +385,7 @@ BOOLEAN LoadExternalGameplayData(STR directoryName)
 	if ( FileExists(fileName) )
 	{
 		DebugMsg (TOPIC_JA2,DBG_LEVEL_3,String("LoadExternalGameplayData, fileName = %s", fileName));
-		if(!ReadInLBEPocketStats(fileName,TRUE))
+		SGP_THROW_IFFALSE(ReadInLBEPocketStats(fileName,TRUE), fileName);
-			return FALSE;
 	}
 #endif
 
@@ -511,8 +509,7 @@ BOOLEAN LoadExternalGameplayData(STR directoryName)
 	if ( FileExists(fileName) )
 	{
 		DebugMsg (TOPIC_JA2,DBG_LEVEL_3,String("LoadExternalGameplayData, fileName = %s", fileName));
-		if(!ReadInStrategicMapSectorTownNames(fileName, TRUE))
+		SGP_THROW_IFFALSE(ReadInStrategicMapSectorTownNames(fileName,TRUE), fileName);
-			return FALSE;
 	}
 #endif
 
@@ -565,7 +562,7 @@ BOOLEAN LoadExternalGameplayData(STR directoryName)
 	if ( FileExists(fileName) )
 	{
 		DebugMsg (TOPIC_JA2,DBG_LEVEL_3,String("LoadExternalGameplayData, fileName = %s", fileName));
-		SGP_THROW_IFFALSE(ReadInShippingDestinations(fileName, TRUE),SHIPPINGDESTINATIONSFILENAME);
+		SGP_THROW_IFFALSE(ReadInShippingDestinations(fileName, TRUE),fileName);
 	}
 #endif
 	
@@ -585,8 +582,7 @@ BOOLEAN LoadExternalGameplayData(STR directoryName)
 	if ( FileExists(fileName) )
 	{
 		DebugMsg (TOPIC_JA2,DBG_LEVEL_3,String("LoadExternalGameplayData, fileName = %s", fileName));
-		if(!ReadInFacilityTypes(fileName,TRUE))
+		SGP_THROW_IFFALSE(ReadInFacilityTypes(fileName,TRUE), fileName);
-			return FALSE;
 	}
 #endif
 
@@ -612,8 +608,7 @@ BOOLEAN LoadExternalGameplayData(STR directoryName)
 	if ( FileExists(fileName) )
 	{
 		DebugMsg (TOPIC_JA2,DBG_LEVEL_3,String("LoadExternalGameplayData, fileName = %s", fileName));
-		if(!ReadInSectorNames(fileName,TRUE,0))
+		SGP_THROW_IFFALSE(ReadInSectorNames(fileName,TRUE, 0), fileName);
-			return FALSE;
 	}
 #endif	
 
@@ -629,12 +624,11 @@ BOOLEAN LoadExternalGameplayData(STR directoryName)
 
 		#ifndef ENGLISH
 			AddLanguagePrefix(fileName);
-				if ( FileExists(fileName) )
+			if ( FileExists(fileName) )
-					{
+			{
-					DebugMsg (TOPIC_JA2,DBG_LEVEL_3,String("LoadExternalGameplayData, fileName = %s", fileName));
+				DebugMsg (TOPIC_JA2,DBG_LEVEL_3,String("LoadExternalGameplayData, fileName = %s", fileName));
-					if(!ReadInMercProfiles(fileName,TRUE))
+				SGP_THROW_IFFALSE(ReadInMercProfiles(fileName,TRUE), fileName);
-					return FALSE;
+			}
-					}
 		#endif
 
 		// HEADROCK PROFEX: Read in Merc Opinion data to replace PROF.DAT data
@@ -689,8 +683,7 @@ BOOLEAN LoadExternalGameplayData(STR directoryName)
 		if ( FileExists(fileName) )
 		{
 			DebugMsg (TOPIC_JA2,DBG_LEVEL_3,String("LoadExternalGameplayData, fileName = %s", fileName));
-			if(!ReadInEnemyNames(fileName,TRUE))
+			SGP_THROW_IFFALSE(ReadInEnemyNames(fileName,TRUE), fileName);
-				return FALSE;
 		}
 #endif
 	}
@@ -709,8 +702,7 @@ BOOLEAN LoadExternalGameplayData(STR directoryName)
 		if ( FileExists(fileName) )
 		{
 			DebugMsg (TOPIC_JA2,DBG_LEVEL_3,String("LoadExternalGameplayData, fileName = %s", fileName));
-			if(!ReadInCivGroupNamesStats(fileName,TRUE))
+			SGP_THROW_IFFALSE(ReadInCivGroupNamesStats(fileName,TRUE), fileName);
-				return FALSE;
 		}
 #endif
 	}
@@ -727,8 +719,7 @@ BOOLEAN LoadExternalGameplayData(STR directoryName)
 		if ( FileExists(fileName) )
 		{
 			DebugMsg (TOPIC_JA2,DBG_LEVEL_3,String("LoadExternalGameplayData, fileName = %s", fileName));
-			if(!ReadInSenderNameList(fileName,TRUE))
+			SGP_THROW_IFFALSE(ReadInSenderNameList(fileName,TRUE), fileName);
-				return FALSE;
 		}
 #endif
 	
@@ -745,8 +736,7 @@ BOOLEAN LoadExternalGameplayData(STR directoryName)
 		if ( FileExists(fileName) )
 		{
 			DebugMsg (TOPIC_JA2,DBG_LEVEL_3,String("LoadExternalGameplayData, fileName = %s", fileName));
-			if(!ReadInEnemyRank(fileName,TRUE))
+			SGP_THROW_IFFALSE(ReadInEnemyRank(fileName,TRUE), fileName);
-				return FALSE;
 		}
 #endif
 	}
@@ -762,8 +752,7 @@ BOOLEAN LoadExternalGameplayData(STR directoryName)
 		if ( FileExists(fileName) )
 		{
 			DebugMsg (TOPIC_JA2,DBG_LEVEL_3,String("LoadExternalGameplayData, fileName = %s", fileName));
-			if(!ReadInIMPPortraits(fileName,TRUE))
+			SGP_THROW_IFFALSE(ReadInIMPPortraits(fileName,TRUE), fileName);
-				return FALSE;
 		}
 #endif
 
@@ -797,8 +786,7 @@ BOOLEAN LoadExternalGameplayData(STR directoryName)
 		if ( FileExists(fileName) )
 		{
 			DebugMsg (TOPIC_JA2,DBG_LEVEL_3,String("LoadExternalGameplayData, fileName = %s", fileName));
-			if(!ReadInMercAvailability(fileName,TRUE))
+			SGP_THROW_IFFALSE(ReadInMercAvailability(fileName,TRUE), fileName);
-				return FALSE;
 		}
 #endif
 	UINT32 i;
@@ -819,12 +807,10 @@ BOOLEAN LoadExternalGameplayData(STR directoryName)
 		if ( FileExists(fileName) )
 		{
 			DebugMsg (TOPIC_JA2,DBG_LEVEL_3,String("LoadExternalGameplayData, fileName = %s", fileName));
-			if(!ReadInAimAvailability(fileName,TRUE))
+			SGP_THROW_IFFALSE(ReadInAimAvailability(fileName,TRUE), fileName);
-				return FALSE;
 		}
 #endif
 
-	
 	LuaState::INIT(lua::LUA_STATE_STRATEGIC_MINES_AND_UNDERGROUND, true);
 	g_luaUnderground.LoadScript(GetLanguagePrefix());
 	// load Lua for Strategic Mines initialization

Utils/_FrenchText.cpp

@@ -2411,7 +2411,7 @@ CHAR16 gMoneyStatsDesc[][ 13 ] =
 	L"Solde",
 	L"actuel :",
 	L"Montant",
-	L"à retirer :",
+	L" à retirer :",
 };
 
 //The health of various creatures, enemies, characters in the game. The numbers following each are for comment
@@ -3685,7 +3685,7 @@ STR16 pErrorStrings[] =
 
 STR16 pPersonnelString[] =
 {
-	L"Mercenaires :", 			// mercs we have
+	L"Merc :", 			// mercs we have
 };