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

Merge with develop

Browse source 
--HG--
branch : compatibility-develop
This commit is contained in:
kervala 2015-12-07 19:38:26 +01:00
commit b9e6658562
2 changed files with 10 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -720,7 +720,6 @@ void addPreDataPaths(NLMISC::IProgressCallback &progress)
#ifdef NL_OS_MAC #ifdef NL_OS_MAC
defaultDirectory = CPath::standardizePath(getAppBundlePath() + "/Contents/Resources"); defaultDirectory = CPath::standardizePath(getAppBundlePath() + "/Contents/Resources");
#elif defined(NL_OS_UNIX) #elif defined(NL_OS_UNIX)
defaultDirectory = CPath::standardizePath(std::string(RYZOM_SHARE_PREFIX));
if (!getRyzomSharePrefix().empty()) defaultDirectory = CPath::standardizePath(getRyzomSharePrefix()); if (!getRyzomSharePrefix().empty()) defaultDirectory = CPath::standardizePath(getRyzomSharePrefix());
#endif #endif

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

@ -62,6 +62,7 @@
#include "login_patch.h" #include "login_patch.h"
#include "login.h" #include "login.h"
#include "user_agent.h"
#ifndef RY_BG_DOWNLOADER #ifndef RY_BG_DOWNLOADER
@ -218,8 +219,15 @@ void CPatchManager::setClientRootPath(const std::string& clientRootPath)
#ifdef NL_OS_MAC #ifdef NL_OS_MAC
ReadableClientDataPath = CPath::standardizePath(getAppBundlePath() + "/Contents/Resources/data"); ReadableClientDataPath = CPath::standardizePath(getAppBundlePath() + "/Contents/Resources/data");
#elif defined(NL_OS_UNIX) && defined(RYZOM_SHARE_PREFIX) #elif defined(NL_OS_UNIX)
ReadableClientDataPath = CPath::standardizePath(std::string(RYZOM_SHARE_PREFIX) + "/data"); if (!getRyzomSharePrefix().empty())
{
ReadableClientDataPath = CPath::standardizePath(getRyzomSharePrefix() + "/data");
}
else
{
ReadableClientDataPath = WritableClientDataPath;
}
#else #else
ReadableClientDataPath = WritableClientDataPath; ReadableClientDataPath = WritableClientDataPath;
#endif #endif