From 88e98b502323bae49d88cb878156605ce7c92479 Mon Sep 17 00:00:00 2001 From: Wanne Date: Thu, 30 Jun 2011 11:32:01 +0000 Subject: [PATCH] - Fixed redundant code duplication when initializing SectorNames.xml for foreign (not English) language git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@4549 3b4a5df2-a311-0410-b5c6-a8a6f20db521 --- Init.cpp | 60 +------------------------------------------------------- 1 file changed, 1 insertion(+), 59 deletions(-) diff --git a/Init.cpp b/Init.cpp index 390b5f892..c593ea9d3 100644 --- a/Init.cpp +++ b/Init.cpp @@ -615,65 +615,7 @@ BOOLEAN LoadExternalGameplayData(STR directoryName) if(!ReadInSectorNames(fileName,TRUE,0)) return FALSE; } -#endif - - // moved to lua - //strcpy(fileName, directoryName); - //strcat(fileName, SECTORLEVEL1NAMESFILENAME); - //DebugMsg (TOPIC_JA2,DBG_LEVEL_3,String("LoadExternalGameplayData, fileName = %s", fileName)); - //SGP_THROW_IFFALSE(ReadInSectorNames(fileName,FALSE,1), SECTORLEVEL1NAMESFILENAME); - // - //#ifndef ENGLISH - //AddLanguagePrefix(fileName); - //if ( FileExists(fileName) ) - //{ - // DebugMsg (TOPIC_JA2,DBG_LEVEL_3,String("LoadExternalGameplayData, fileName = %s", fileName)); - // if(!ReadInSectorNames(fileName,TRUE,1)) - // return FALSE; - //} - //#endif - - //strcpy(fileName, directoryName); - //strcat(fileName, SECTORLEVEL2NAMESFILENAME); - //DebugMsg (TOPIC_JA2,DBG_LEVEL_3,String("LoadExternalGameplayData, fileName = %s", fileName)); - //SGP_THROW_IFFALSE(ReadInSectorNames(fileName,FALSE,2), SECTORLEVEL2NAMESFILENAME); - // - //#ifndef ENGLISH - //AddLanguagePrefix(fileName); - //if ( FileExists(fileName) ) - //{ - // DebugMsg (TOPIC_JA2,DBG_LEVEL_3,String("LoadExternalGameplayData, fileName = %s", fileName)); - // if(!ReadInSectorNames(fileName,TRUE,2)) - // return FALSE; - //} - //#endif - - //strcpy(fileName, directoryName); - //strcat(fileName, SECTORLEVEL3NAMESFILENAME); - //DebugMsg (TOPIC_JA2,DBG_LEVEL_3,String("LoadExternalGameplayData, fileName = %s", fileName)); - //SGP_THROW_IFFALSE(ReadInSectorNames(fileName,FALSE,3), SECTORLEVEL3NAMESFILENAME); - // - //#ifndef ENGLISH - //AddLanguagePrefix(fileName); - //if ( FileExists(fileName) ) - //{ - // DebugMsg (TOPIC_JA2,DBG_LEVEL_3,String("LoadExternalGameplayData, fileName = %s", fileName)); - // if(!ReadInSectorNames(fileName,TRUE,3)) - // return FALSE; - //} - //#endif - - - // code duplication? -#ifndef ENGLISH - AddLanguagePrefix(fileName); - if ( FileExists(fileName) ) - { - DebugMsg (TOPIC_JA2,DBG_LEVEL_3,String("LoadExternalGameplayData, fileName = %s", fileName)); - if(!ReadInSectorNames(fileName,TRUE,0)) - return FALSE; - } -#endif +#endif // WANNE: Why do we need it. It should also run without that file!! // SANDRO - always initialize those files, we need it on game start