From 6870bb4ce3284146ad49e673302a9ae8eef8a90c Mon Sep 17 00:00:00 2001 From: kervala Date: Mon, 9 Aug 2010 15:25:58 +0200 Subject: [PATCH] Changed: #1023 PreDataPath and DataPath must be set in client_default.cfg --- code/ryzom/client/src/client_cfg.cpp | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/code/ryzom/client/src/client_cfg.cpp b/code/ryzom/client/src/client_cfg.cpp index d9306e145..d53e6f2c1 100644 --- a/code/ryzom/client/src/client_cfg.cpp +++ b/code/ryzom/client/src/client_cfg.cpp @@ -1991,7 +1991,7 @@ void CClientConfig::init(const string &configFileName) #ifdef RYZOM_ETC_PREFIX if (!found) { - defaultConfigFileName = std::string(RYZOM_ETC_PREFIX"/") + defaultConfigFileName; + defaultConfigFileName = CPath::standardizePath(RYZOM_ETC_PREFIX) + defaultConfigFileName; if (CFile::isExists(defaultConfigFileName)) found = true; } #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 ()); } 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); } else