Khaganat-NeL/khanat-opennel-code
2
0
Fork 0
Code Issues 21 Pull requests Projects Releases 1 Packages Wiki Activity

Changed: use bundle resource if default cfg is not found

Browse source
This commit is contained in:
vl 2011-02-14 18:03:49 +01:00
parent 5b59e4f95b
commit 04d082ced8
1 changed files with 9 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
code/ryzom/client/src/init.cpp
View file

@ -577,12 +577,19 @@ void checkDriverDepth ()
static std::string replaceApplicationDirToken(const std::string &dir) static std::string replaceApplicationDirToken(const std::string &dir)
{ {
#ifdef NL_OS_MAC
// if client_default.cfg is not in current directory, and it's not an absolute path, use application default directory
if (!CFile::isExists("client_default.cfg") && dir.size()>0 && dir[0]!='/')
{
return getAppBundlePath() + "/Contents/Resources/" + dir;
}
#else
static const std::string token = "<ApplicationDir>"; static const std::string token = "<ApplicationDir>";
std::string::size_type pos = dir.find(token); std::string::size_type pos = dir.find(token);
if (pos != std::string::npos) if (pos != std::string::npos)
return dir.substr(0, pos) + getAppBundlePath() + dir.substr(pos + token.length()); return dir.substr(0, pos) + getAppBundlePath() + dir.substr(pos + token.length());
#endif
// preDataPath = getAppBundlePath() + "/Contents/Resources/" + preDataPath; // preDataPath = getAppBundlePath() + "/Contents/Resources/" + preDataPath;