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 2016-01-12 22:32:22 +01:00
commit df816b2a5d
2 changed files with 19 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
code/nel/include/nel/gui/lua_helper_inline.h
View file

@ -253,7 +253,15 @@ inline lua_Integer CLuaState::toInteger(int index)
{ {
//H_AUTO(Lua_CLuaState_toInteger) //H_AUTO(Lua_CLuaState_toInteger)
checkIndex(index); checkIndex(index);
return lua_tointeger(_State, index); sint isnum = 0;
lua_Integer res = lua_tointegerx(_State, index, &isnum);
if (!isnum)
{
lua_Number d = lua_tonumber(_State, index);
nlwarning("Lua: Unable to convert Lua number %lf to integer", d);
res = (lua_Integer)d;
}
return res;
} }
//================================================================================ //================================================================================

21
code/ryzom/client/src/login_progress_post_thread.cpp
View file

@ -345,21 +345,20 @@ void CLoginProgressPostThread::init(NLMISC::CConfigFile &configFile)
static std::string::size_type httpStrSize = httpStr.size(); static std::string::size_type httpStrSize = httpStr.size();
std::string tmp = configFile.getVarPtr("InstallStatsUrl")->asString(0); std::string tmp = configFile.getVarPtr("InstallStatsUrl")->asString(0);
std::string::size_type it= tmp.find(httpStr); std::string::size_type it= tmp.find(httpStr);
if (it != std::string::npos) if (it == std::string::npos) return;
{
std::string::size_type hostPageSeparator = tmp.find("/", httpStrSize); std::string::size_type hostPageSeparator = tmp.find("/", httpStrSize);
if (hostPageSeparator != std::string::npos) if (hostPageSeparator == std::string::npos) return;
{
installStartupPage = tmp.substr(hostPageSeparator); //keep the leading slash installStartupPage = tmp.substr(hostPageSeparator); //keep the leading slash
installStartupHost = tmp.substr(httpStrSize, hostPageSeparator - httpStrSize); // dont keep the last slah installStartupHost = tmp.substr(httpStrSize, hostPageSeparator - httpStrSize); // dont keep the last slah
}
} init(installStartupHost, installStartupPage);
} }
else else
{ {
nlwarning("Error the InstallStatsUrl is not in the client_default.cfg."); // nlwarning("Error the InstallStatsUrl is not in the client_default.cfg.");
} }
init(installStartupHost, installStartupPage);
} }