mirror of
https://port.numenaute.org/aleajactaest/khanat-code-old.git
synced 2024-11-17 21:11:39 +00:00
Changed: Don't patch "main_exedll" and "main_cfg" categories under Unix
This commit is contained in:
parent
f9f17b0cff
commit
19eeb99e37
2 changed files with 7 additions and 36 deletions
|
@ -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
|
||||
|
||||
|
|
|
@ -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
|
||||
}
|
||||
|
||||
// ****************************************************************************
|
||||
|
|
Loading…
Reference in a new issue