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

Changed: Minor changes

Browse source
This commit is contained in:
kervala 2014-04-25 11:58:35 +02:00
parent eedaee3da3
commit 2f2bded357
1 changed files with 8 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -302,7 +302,7 @@ CClientConfig::CClientConfig()
Contrast = 0.f; // Default Monitor Contrast. Contrast = 0.f; // Default Monitor Contrast.
Luminosity = 0.f; // Default Monitor Luminosity. Luminosity = 0.f; // Default Monitor Luminosity.
Gamma = 0.f; // Default Monitor Gamma. Gamma = 0.f; // Default Monitor Gamma.
VREnable = false; VREnable = false;
VRDisplayDevice = "Auto"; VRDisplayDevice = "Auto";
VRDisplayDeviceId = ""; VRDisplayDeviceId = "";
@ -888,7 +888,7 @@ void CClientConfig::setValues()
READ_STRING_DEV(ForgetPwdURL) READ_STRING_DEV(ForgetPwdURL)
READ_STRING_DEV(FreeTrialURL) READ_STRING_DEV(FreeTrialURL)
READ_STRING_DEV(LoginSupportURL) READ_STRING_DEV(LoginSupportURL)
READ_STRING_FV(CreateAccountURL) READ_STRING_FV(CreateAccountURL)
READ_STRING_FV(EditAccountURL) READ_STRING_FV(EditAccountURL)
READ_STRING_FV(ConditionsTermsURL) READ_STRING_FV(ConditionsTermsURL)
@ -1073,10 +1073,10 @@ void CClientConfig::setValues()
///////////////////////// /////////////////////////
// NEW PATCHLET SYSTEM // // NEW PATCHLET SYSTEM //
READ_STRING_FV(PatchletUrl) READ_STRING_FV(PatchletUrl)
//////////////////////// ///////////
// WEBIG // // WEBIG //
READ_STRING_FV(WebIgMainDomain); READ_STRING_FV(WebIgMainDomain);
READ_STRINGVECTOR_FV(WebIgTrustedDomains); READ_STRINGVECTOR_FV(WebIgTrustedDomains);
@ -2211,28 +2211,24 @@ bool CClientConfig::getDefaultConfigLocation(std::string& p_name) const
std::string defaultConfigFileName = "client_default.cfg"; std::string defaultConfigFileName = "client_default.cfg";
std::string defaultConfigPath; std::string defaultConfigPath;
p_name = std::string(); p_name.clear();
#ifdef NL_OS_MAC #ifdef NL_OS_MAC
// on mac, client_default.cfg should be searched in .app/Contents/Resources/ // on mac, client_default.cfg should be searched in .app/Contents/Resources/
defaultConfigPath = defaultConfigPath = CPath::standardizePath(getAppBundlePath() + "/Contents/Resources/");
CPath::standardizePath(getAppBundlePath() + "/Contents/Resources/");
#elif defined(RYZOM_ETC_PREFIX) #elif defined(RYZOM_ETC_PREFIX)
// if RYZOM_ETC_PREFIX is defined, client_default.cfg might be over there // if RYZOM_ETC_PREFIX is defined, client_default.cfg might be over there
defaultConfigPath = CPath::standardizePath(RYZOM_ETC_PREFIX); defaultConfigPath = CPath::standardizePath(RYZOM_ETC_PREFIX);
#else #else
// some other prefix here :) // some other prefix here :)
#endif // RYZOM_ETC_PREFIX #endif // RYZOM_ETC_PREFIX
// look in the current working directory first // look in the current working directory first
if(CFile::isExists(defaultConfigFileName)) if (CFile::isExists(defaultConfigFileName))
p_name = defaultConfigFileName; p_name = defaultConfigFileName;
// if not in working directory, check using prefix path // if not in working directory, check using prefix path
else if(CFile::isExists(defaultConfigPath + defaultConfigFileName)) else if (CFile::isExists(defaultConfigPath + defaultConfigFileName))
p_name = defaultConfigPath + defaultConfigFileName; p_name = defaultConfigPath + defaultConfigFileName;
// if some client_default.cfg was found return true // if some client_default.cfg was found return true