refactor(language): Remove legacy code for loading Language9x.ini, HeaderTemplate9x.ini (#1534)

Author: xezon

Generals/Code/GameEngine/Source/GameClient/GUI/HeaderTemplate.cpp

@@ -136,22 +136,14 @@ HeaderTemplateManager::~HeaderTemplateManager( void )
 
 void HeaderTemplateManager::init( void )
 {
-	INI ini;
-	AsciiString fname;
-	fname.format("Data\\%s\\HeaderTemplate", GetRegistryLanguage().str());
-	OSVERSIONINFO	osvi;
-	osvi.dwOSVersionInfoSize=sizeof(OSVERSIONINFO);
-	if (GetVersionEx(&osvi))
-	{	//check if we're running Win9x variant since they may need different fonts
-		if (osvi.dwPlatformId == VER_PLATFORM_WIN32_WINDOWS)
-		{	AsciiString tempName;
-
-			tempName.format("Data\\%s\\HeaderTemplate9x.ini", GetRegistryLanguage().str());
-			if (TheFileSystem->doesFileExist(tempName.str()))
-				fname = tempName;
-		}
+	{
+		AsciiString fname;
+		fname.format("Data\\%s\\HeaderTemplate", GetRegistryLanguage().str());
+
+		INI ini;
+		ini.loadFileDirectory( fname, INI_LOAD_OVERWRITE, NULL );
 	}
-	ini.loadFileDirectory( fname, INI_LOAD_OVERWRITE, NULL );
+
 	populateGameFonts();
 }
 

Generals/Code/GameEngine/Source/GameClient/GlobalLanguage.cpp

@@ -133,23 +133,14 @@ GlobalLanguage::~GlobalLanguage()
 
 void GlobalLanguage::init( void )
 {
+	{
+		AsciiString fname;
+		fname.format("Data\\%s\\Language", GetRegistryLanguage().str());
 
-	INI ini;
-	AsciiString fname;
-	fname.format("Data\\%s\\Language", GetRegistryLanguage().str());
-
-	OSVERSIONINFO	osvi;
-	osvi.dwOSVersionInfoSize=sizeof(OSVERSIONINFO);
-	//GS NOTE: Must call doesFileExist in either case so that NameKeyGenerator will stay in sync
-	AsciiString tempName;
-	tempName.format("Data\\%s\\Language9x.ini", GetRegistryLanguage().str());
-	bool isExist = TheFileSystem->doesFileExist(tempName.str());
-	if (GetVersionEx(&osvi)  &&  osvi.dwPlatformId == VER_PLATFORM_WIN32_WINDOWS  && isExist)
-	{	//check if we're running Win9x variant since they may need different fonts
-		fname = tempName;
-	}
+		INI ini;
+		ini.loadFileDirectory( fname, INI_LOAD_OVERWRITE, NULL );
+ 	}
 
-	ini.loadFileDirectory( fname, INI_LOAD_OVERWRITE, NULL );
 	StringListIt it = m_localFonts.begin();
 	while( it != m_localFonts.end())
 	{

GeneralsMD/Code/GameEngine/Source/GameClient/GUI/HeaderTemplate.cpp

@@ -136,22 +136,14 @@ HeaderTemplateManager::~HeaderTemplateManager( void )
 
 void HeaderTemplateManager::init( void )
 {
-	INI ini;
-	AsciiString fname;
-	fname.format("Data\\%s\\HeaderTemplate", GetRegistryLanguage().str());
-	OSVERSIONINFO	osvi;
-	osvi.dwOSVersionInfoSize=sizeof(OSVERSIONINFO);
-	if (GetVersionEx(&osvi))
-	{	//check if we're running Win9x variant since they may need different fonts
-		if (osvi.dwPlatformId == VER_PLATFORM_WIN32_WINDOWS)
-		{	AsciiString tempName;
-
-			tempName.format("Data\\%s\\HeaderTemplate9x.ini", GetRegistryLanguage().str());
-			if (TheFileSystem->doesFileExist(tempName.str()))
-				fname = tempName;
-		}
+	{
+		AsciiString fname;
+		fname.format("Data\\%s\\HeaderTemplate", GetRegistryLanguage().str());
+
+		INI ini;
+		ini.loadFileDirectory( fname, INI_LOAD_OVERWRITE, NULL );
 	}
-	ini.loadFileDirectory( fname, INI_LOAD_OVERWRITE, NULL );
+
 	populateGameFonts();
 }
 

GeneralsMD/Code/GameEngine/Source/GameClient/GlobalLanguage.cpp

@@ -135,25 +135,14 @@ GlobalLanguage::~GlobalLanguage()
 
 void GlobalLanguage::init( void )
 {
+	{
+		AsciiString fname;
+		fname.format("Data\\%s\\Language", GetRegistryLanguage().str());
 
-	INI ini;
-	AsciiString fname;
-	fname.format("Data\\%s\\Language", GetRegistryLanguage().str());
-
-	OSVERSIONINFO	osvi;
-	osvi.dwOSVersionInfoSize=sizeof(OSVERSIONINFO);
-
-	//GS NOTE: Must call doesFileExist in either case so that NameKeyGenerator will stay in sync
-	AsciiString tempName;
-	tempName.format("Data\\%s\\Language9x.ini", GetRegistryLanguage().str());
-	bool isExist = TheFileSystem->doesFileExist(tempName.str());
-	if (GetVersionEx(&osvi)  &&  osvi.dwPlatformId == VER_PLATFORM_WIN32_WINDOWS  && isExist)
-	{	//check if we're running Win9x variant since they may need different fonts
-		fname = tempName;
+		INI ini;
+		ini.loadFileDirectory( fname, INI_LOAD_OVERWRITE, NULL );
 	}
 
-
-	ini.loadFileDirectory( fname, INI_LOAD_OVERWRITE, NULL );
 	StringListIt it = m_localFonts.begin();
 	while( it != m_localFonts.end())
 	{