From 02331f7b331be4d7672f44438e1477b41fb04eb3 Mon Sep 17 00:00:00 2001
From: kervala <devnull@localhost>
Date: Sat, 22 Mar 2014 19:36:53 +0100
Subject: [PATCH] Changed: Don't patch "main_exedll" and "main_cfg" categories
 under Unix

---
 code/ryzom/client/src/init.cpp        |  7 ------
 code/ryzom/client/src/login_patch.cpp | 36 ++++++---------------------
 2 files changed, 7 insertions(+), 36 deletions(-)

diff --git a/code/ryzom/client/src/init.cpp b/code/ryzom/client/src/init.cpp
index 1c4fe76e9..d603be4a3 100644
--- a/code/ryzom/client/src/init.cpp
+++ b/code/ryzom/client/src/init.cpp
@@ -829,13 +829,6 @@ void prelogInit()
 
 		CLoginProgressPostThread::getInstance().init(ClientCfg.ConfigFile);
 
-		// tmp for patcher debug
-		extern void tmpFlagMainlandPatchCategories(NLMISC::CConfigFile &cf);
-		extern void tmpFlagRemovedPatchCategories(NLMISC::CConfigFile &cf);
-		tmpFlagMainlandPatchCategories(ClientCfg.ConfigFile);
-		tmpFlagRemovedPatchCategories(ClientCfg.ConfigFile);
-
-
 		// check "BuildName" in ClientCfg
 		//nlassert(!ClientCfg.BuildName.empty()); // TMP comment by nico do not commit
 
diff --git a/code/ryzom/client/src/login_patch.cpp b/code/ryzom/client/src/login_patch.cpp
index 6976926ba..a51f2c1d5 100644
--- a/code/ryzom/client/src/login_patch.cpp
+++ b/code/ryzom/client/src/login_patch.cpp
@@ -79,35 +79,6 @@
 static std::vector<std::string> ForceMainlandPatchCategories;
 static std::vector<std::string> ForceRemovePatchCategories;
 
-// TMP for debug : force some category in the patch to be flagged as 'mainland' until
-// the actual file is updated
-void tmpFlagMainlandPatchCategories(NLMISC::CConfigFile &cf)
-{
-	NLMISC::CConfigFile::CVar *catList = cf.getVarPtr("ForceMainlandPatchCategories");
-	if (catList)
-	{
-		for (uint k = 0; k < catList->size(); ++k)
-		{
-			ForceMainlandPatchCategories.push_back(catList->asString(k));
-		}
-	}
-}
-
-// TMP for debug : force some category in the patch to be flagged as 'mainland' until
-// the actual file is updated
-void tmpFlagRemovedPatchCategories(NLMISC::CConfigFile &cf)
-{
-	NLMISC::CConfigFile::CVar *catList = cf.getVarPtr("RemovePatchCategories");
-	if (catList)
-	{
-		for (uint k = 0; k < catList->size(); ++k)
-		{
-			ForceRemovePatchCategories.push_back(catList->asString(k));
-		}
-	}
-}
-
-
 using namespace std;
 using namespace NLMISC;
 
@@ -219,6 +190,13 @@ CPatchManager::CPatchManager() : State("t_state"), DataScanState("t_data_scan_st
 	_AsyncDownloader = NULL;
 	_StateListener = NULL;
 	_StartRyzomAtEnd = true;
+
+#ifdef NL_OS_UNIX
+	// don't use cfg, exe and dll from Windows version
+	ForceRemovePatchCategories.clear();
+	ForceRemovePatchCategories.push_back("main_exedll");
+	ForceRemovePatchCategories.push_back("main_cfg");
+#endif
 }
 
 // ****************************************************************************