From defbf8444f1721881734f9353182449fce6d3b0c Mon Sep 17 00:00:00 2001 From: Wanne Date: Thu, 17 May 2012 13:19:34 +0000 Subject: [PATCH] - Bugfix: Game was not initializing "TableData\Map\*.SectorNames.xml" when playing in foreign (not English) language git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5282 3b4a5df2-a311-0410-b5c6-a8a6f20db521 --- Init.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/Init.cpp b/Init.cpp index 33747e13..eb9df899 100644 --- a/Init.cpp +++ b/Init.cpp @@ -659,12 +659,6 @@ BOOLEAN LoadExternalGameplayData(STR directoryName) DebugMsg (TOPIC_JA2,DBG_LEVEL_3,String("LoadExternalGameplayData, fileName = %s", fileName)); SGP_THROW_IFFALSE(ReadInSectorNames(fileName,FALSE,0), SECTORNAMESFILENAME); - // HEADROCK HAM 5: Read in Coolness by Sector - strcpy(fileName, directoryName); - strcat(fileName, COOLNESSBYSECTORFILENAME); - DebugMsg (TOPIC_JA2,DBG_LEVEL_3,String("LoadExternalGameplayData, fileName = %s", fileName)); - SGP_THROW_IFFALSE(ReadInCoolnessBySector(fileName), COOLNESSBYSECTORFILENAME); - #ifndef ENGLISH AddLanguagePrefix(fileName); if ( FileExists(fileName) ) @@ -674,6 +668,12 @@ BOOLEAN LoadExternalGameplayData(STR directoryName) } #endif + // HEADROCK HAM 5: Read in Coolness by Sector + strcpy(fileName, directoryName); + strcat(fileName, COOLNESSBYSECTORFILENAME); + DebugMsg (TOPIC_JA2,DBG_LEVEL_3,String("LoadExternalGameplayData, fileName = %s", fileName)); + SGP_THROW_IFFALSE(ReadInCoolnessBySector(fileName), COOLNESSBYSECTORFILENAME); + // WANNE: Why do we need it. It should also run without that file!! // SANDRO - always initialize those files, we need it on game start if (gGameExternalOptions.fReadProfileDataFromXML)