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

Default merge

Browse source
This commit is contained in:
kervala 2014-04-24 23:01:54 +02:00
commit 9c9d3973e1
2 changed files with 32 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
code/nel/src/gui/ctrl_col_pick.cpp
View file

@ -210,7 +210,7 @@ namespace NLGUI
}
prop = (char*) xmlGetProp( node, (xmlChar*)"onchange" );
if (prop) _AHOnChange = NLMISC::toLower(prop);
if (prop) _AHOnChange = NLMISC::toLower((const char*)prop);
prop = (char*) xmlGetProp( node, (xmlChar*)"onchange_params" );
if (prop) _AHOnChangeParams = string((const char*)prop);

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

@ -302,7 +302,7 @@ CClientConfig::CClientConfig()
Contrast = 0.f; // Default Monitor Contrast.
Luminosity = 0.f; // Default Monitor Luminosity.
Gamma = 0.f; // Default Monitor Gamma.
VREnable = false;
VRDisplayDevice = "Auto";
VRDisplayDeviceId = "";
@ -327,13 +327,13 @@ CClientConfig::CClientConfig()
TexturesLoginInterface.push_back("texture_interfaces_v3_login");
DisplayAccountButtons = true;
CreateAccountURL = "https://secure.ryzom.com/signup/from_client.php";
CreateAccountURL = "http://shard.ryzomcore.org/ams/index.php?page=register";
ConditionsTermsURL = "https://secure.ryzom.com/signup/terms_of_use.php";
EditAccountURL = "https://secure.ryzom.com/payment_profile/index.php";
EditAccountURL = "http://shard.ryzomcore.org/ams/index.php?page=settings";
BetaAccountURL = "http://www.ryzom.com/profile";
ForgetPwdURL = "https://secure.ryzom.com/payment_profile/lost_secure_password.php";
ForgetPwdURL = "http://shard.ryzomcore.org/ams/index.php?page=forgot_password";
FreeTrialURL = "http://www.ryzom.com/join/?freetrial=1";
LoginSupportURL = "http://www.ryzom.com/en/support.html";
LoginSupportURL = "http://shard.ryzomcore.org/ams/index.php";
Position = CVector(0.f, 0.f, 0.f); // Default Position.
Heading = CVector(0.f, 1.f, 0.f); // Default Heading.
EyesHeight = 1.5f; // Default User Eyes Height.
@ -888,6 +888,14 @@ void CClientConfig::setValues()
READ_STRING_DEV(ForgetPwdURL)
READ_STRING_DEV(FreeTrialURL)
READ_STRING_DEV(LoginSupportURL)
READ_STRING_FV(CreateAccountURL)
READ_STRING_FV(EditAccountURL)
READ_STRING_FV(ConditionsTermsURL)
READ_STRING_FV(BetaAccountURL)
READ_STRING_FV(ForgetPwdURL)
READ_STRING_FV(FreeTrialURL)
READ_STRING_FV(LoginSupportURL)
#ifndef RZ_NO_CLIENT
// if cookie is not empty, it means that the client was launch
@ -1051,17 +1059,24 @@ void CClientConfig::setValues()
/////////////////////////
// NEW PATCHING SYSTEM //
READ_BOOL_FV(PatchWanted)
READ_STRING_FV(PatchServer)
READ_STRING_FV(PatchUrl)
READ_STRING_FV(PatchVersion)
READ_STRING_FV(RingReleaseNotePath)
READ_STRING_FV(ReleaseNotePath)
READ_BOOL_DEV(PatchWanted)
READ_STRING_DEV(PatchServer)
READ_STRING_DEV(PatchUrl)
READ_STRING_DEV(PatchVersion)
READ_STRING_DEV(RingReleaseNotePath)
READ_STRING_DEV(ReleaseNotePath)
READ_STRING_FV(PatchServer)
/////////////////////////
// NEW PATCHLET SYSTEM //
// NEW PATCHLET SYSTEM //
READ_STRING_FV(PatchletUrl)
///////////
////////////////////////
// WEBIG //
READ_STRING_FV(WebIgMainDomain);
READ_STRINGVECTOR_FV(WebIgTrustedDomains);
@ -2196,24 +2211,28 @@ bool CClientConfig::getDefaultConfigLocation(std::string& p_name) const
std::string defaultConfigFileName = "client_default.cfg";
std::string defaultConfigPath;
p_name.clear();
p_name = std::string();
#ifdef NL_OS_MAC
// on mac, client_default.cfg should be searched in .app/Contents/Resources/
defaultConfigPath = CPath::standardizePath(getAppBundlePath() + "/Contents/Resources/");
defaultConfigPath =
CPath::standardizePath(getAppBundlePath() + "/Contents/Resources/");
#elif defined(RYZOM_ETC_PREFIX)
// if RYZOM_ETC_PREFIX is defined, client_default.cfg might be over there
defaultConfigPath = CPath::standardizePath(RYZOM_ETC_PREFIX);
#else
// some other prefix here :)
#endif // RYZOM_ETC_PREFIX
// look in the current working directory first
if (CFile::isExists(defaultConfigFileName))
if(CFile::isExists(defaultConfigFileName))
p_name = defaultConfigFileName;
// 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;
// if some client_default.cfg was found return true