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
This commit is contained in:
kervala 2016-02-23 17:05:57 +01:00
parent 10f56871e6
commit 75199aad21
4 changed files with 21 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
code/nel/src/misc/system_utils.cpp
View file

@ -231,11 +231,11 @@ bool CSystemUtils::supportUnicode()
{
init = true;
#ifdef NL_OS_WINDOWS
OSVERSIONINFO osvi;
OSVERSIONINFOA osvi;
osvi.dwOSVersionInfoSize = sizeof(OSVERSIONINFO);
// get Windows version
if (GetVersionEx(&osvi))
if (GetVersionExA(&osvi))
{
if (osvi.dwPlatformId == VER_PLATFORM_WIN32_NT)
{
@ -347,7 +347,7 @@ bool CSystemUtils::setRegKey(const string &ValueName, const string &Value)
HKEY hkey;
DWORD dwDisp;
if (RegCreateKeyExW(HKEY_CURRENT_USER, utf8ToWide(RootKey), 0, L"", REG_OPTION_NON_VOLATILE, KEY_ALL_ACCESS, NULL, &hkey, &dwDisp) == ERROR_SUCCESS)
if (RegCreateKeyExW(HKEY_CURRENT_USER, utf8ToWide(RootKey), 0, NULL, REG_OPTION_NON_VOLATILE, KEY_ALL_ACCESS, NULL, &hkey, &dwDisp) == ERROR_SUCCESS)
{
ucstring utf16Value = ucstring::makeFromUtf8(Value);

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

@ -2212,9 +2212,11 @@ bool CClientConfig::getDefaultConfigLocation(std::string& p_name) const
defaultConfigPath = Args.getProgramPath();
#endif
std::string currentPath = CPath::standardizePath(CPath::getCurrentPath());
// look in the current working directory first
if (CFile::isExists(defaultConfigFileName))
p_name = defaultConfigFileName;
if (CFile::isExists(currentPath + defaultConfigFileName))
p_name = currentPath + defaultConfigFileName;
// look in startup directory
else if (CFile::isExists(Args.getStartupPath() + defaultConfigFileName))

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

@ -1029,12 +1029,20 @@ void CPatchManager::executeBatchFile()
arguments += "\"" + RyzomFilename + "\" \"" + ClientPatchPath + "\" " + ClientRootPath + "\"";
#endif
// append login and password
arguments += " " + LoginLogin + " " + LoginPassword;
if (!r2Mode)
// append login, password and shard
if (!LoginLogin.empty())
{
arguments += " " + toString(LoginShardId);
arguments += " " + LoginLogin;
if (!LoginPassword.empty())
{
arguments += " " + LoginPassword;
if (!r2Mode)
{
arguments += " " + toString(LoginShardId);
}
}
}
if (!launchProgram(batchFilename, arguments, false))

2
code/ryzom/common/src/game_share/http_client.cpp
View file

@ -79,7 +79,7 @@ bool CHttpClient::send(const std::string& buffer, bool verbose)
if(verbose)
{
nldebug("Sending '%s' to '%s'", buffer.c_str(), _Sock.remoteAddr().asString().c_str());
nldebug("Sending '%s' to '%s'", trim(buffer).c_str(), _Sock.remoteAddr().asString().c_str());
}
uint32 size = (uint32)buffer.size();