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

Fix r2ed

Browse source
This commit is contained in:
kaetemi 2014-09-15 14:33:07 +02:00
parent fab78e58e9
commit 1a8b6333ba
2 changed files with 10 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
code/ryzom/client/src/far_tp.cpp
View file

@ -1132,7 +1132,7 @@ void CFarTP::disconnectFromPreviousShard()
*/ */
NetMngr.reinit(); NetMngr.reinit();
if( !isReselectingChar() ) if (isIngame())
{ {
nlinfo("FarTP: calling EntitiesMngr.reinit()"); nlinfo("FarTP: calling EntitiesMngr.reinit()");
EntitiesMngr.reinit(); EntitiesMngr.reinit();

10
code/ryzom/client/src/r2/dmc/com_lua_module.cpp
View file

@ -238,7 +238,15 @@ void CComLuaModule::initLuaLib()
}; };
int initialStackSize = lua_gettop(_LuaState); int initialStackSize = lua_gettop(_LuaState);
#if LUA_VERSION_NUM >= 502 #if LUA_VERSION_NUM >= 502
luaL_newlib(_LuaState, methods); // luaL_newlib(_LuaState, methods);
// lua_setglobal(_LuaState, R2_LUA_PATH);
lua_getglobal(_LuaState, R2_LUA_PATH);
if (lua_isnil(_LuaState, -1))
{
lua_pop(_LuaState, 1);
lua_newtable(_LuaState);
}
luaL_setfuncs(_LuaState, methods, 0);
lua_setglobal(_LuaState, R2_LUA_PATH); lua_setglobal(_LuaState, R2_LUA_PATH);
#else #else
luaL_openlib(_LuaState, R2_LUA_PATH, methods, 0); luaL_openlib(_LuaState, R2_LUA_PATH, methods, 0);