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

Changed: Check for alternative directories

Browse source
This commit is contained in:
kervala 2015-12-12 11:12:38 +01:00
parent 7e6f04c343
commit 728eecc08b
3 changed files with 8 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
code/ryzom/client/src/client_cfg.cpp
View file

@ -2210,7 +2210,7 @@ bool CClientConfig::getDefaultConfigLocation(std::string& p_name) const
defaultConfigPath = CPath::standardizePath(getAppBundlePath() + "/Contents/Resources/");
#elif defined(NL_OS_UNIX)
// if RYZOM_ETC_PREFIX is defined, client_default.cfg might be over there
if (!getRyzomEtcPrefix().empty()) defaultConfigPath = CPath::standardizePath(getRyzomEtcPrefix());
defaultConfigPath = CPath::standardizePath(getRyzomEtcPrefix());
#else
// some other prefix here :)
#endif // NL_OS_UNIX

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

@ -675,7 +675,7 @@ void addSearchPaths(IProgressCallback &progress)
#ifdef NL_OS_MAC
defaultDirectory = CPath::standardizePath(getAppBundlePath() + "/Contents/Resources");
#elif defined(NL_OS_UNIX)
if (!getRyzomSharePrefix().empty()) defaultDirectory = CPath::standardizePath(getRyzomSharePrefix());
if (CFile::isDirectory(getRyzomSharePrefix()) defaultDirectory = CPath::standardizePath(getRyzomSharePrefix());
#endif
// add in last position, a specific possibly read only directory
@ -720,7 +720,7 @@ void addPreDataPaths(NLMISC::IProgressCallback &progress)
#ifdef NL_OS_MAC
defaultDirectory = CPath::standardizePath(getAppBundlePath() + "/Contents/Resources");
#elif defined(NL_OS_UNIX)
if (!getRyzomSharePrefix().empty()) defaultDirectory = CPath::standardizePath(getRyzomSharePrefix());
if (CFile::isDirectory(getRyzomSharePrefix()) defaultDirectory = CPath::standardizePath(getRyzomSharePrefix());
#endif
// add in last position, a specific possibly read only directory

12
code/ryzom/client/src/login_patch.cpp
View file

@ -220,17 +220,13 @@ void CPatchManager::setClientRootPath(const std::string& clientRootPath)
#ifdef NL_OS_MAC
ReadableClientDataPath = CPath::standardizePath(getAppBundlePath() + "/Contents/Resources/data");
#elif defined(NL_OS_UNIX)
if (!getRyzomSharePrefix().empty())
{
ReadableClientDataPath = CPath::standardizePath(getRyzomSharePrefix() + "/data");
}
else
{
ReadableClientDataPath = WritableClientDataPath;
}
if (CFile::isDirectory(ReadableClientDataPath)) ReadableClientDataPath.clear()
#else
ReadableClientDataPath = WritableClientDataPath;
ReadableClientDataPath.clear();
#endif
if (ReadableClientDataPath.empty()) ReadableClientDataPath = WritableClientDataPath;
}
// ****************************************************************************