Changed: #1023 PreDataPath and DataPath must be set in client_default.cfg

This commit is contained in:
kervala 2010-08-09 15:25:58 +02:00
parent 70568a127d
commit d67c4a1aaa

View file

@ -1991,7 +1991,7 @@ void CClientConfig::init(const string &configFileName)
#ifdef RYZOM_ETC_PREFIX #ifdef RYZOM_ETC_PREFIX
if (!found) if (!found)
{ {
defaultConfigFileName = std::string(RYZOM_ETC_PREFIX"/") + defaultConfigFileName; defaultConfigFileName = CPath::standardizePath(RYZOM_ETC_PREFIX) + defaultConfigFileName;
if (CFile::isExists(defaultConfigFileName)) found = true; if (CFile::isExists(defaultConfigFileName)) found = true;
} }
#endif // RYZOM_ETC_PREFIX #endif // RYZOM_ETC_PREFIX
@ -2009,10 +2009,6 @@ void CClientConfig::init(const string &configFileName)
nlwarning("CFG::init: creating '%s' with default values", configFileName.c_str ()); nlwarning("CFG::init: creating '%s' with default values", configFileName.c_str ());
} }
fprintf(fp, "RootConfigFilename = \"%s\";\n", defaultConfigFileName.c_str()); fprintf(fp, "RootConfigFilename = \"%s\";\n", defaultConfigFileName.c_str());
#ifdef RYZOM_SHARE_PREFIX
fprintf(fp, "PreDataPath = { \"user\", \"patch\", \"examples\", \"%s/data/fonts\", \"%s/data/gamedev.bnp\" };\n", RYZOM_SHARE_PREFIX, RYZOM_SHARE_PREFIX);
fprintf(fp, "DataPath = { \"%s/data\" };\n", RYZOM_SHARE_PREFIX);
#endif // RYZOM_SHARE_PREFIX
fclose(fp); fclose(fp);
} }
else else