mirror-games/glest-source
1
0
Fork 0
mirror of https://github.com/glest/glest-source.git synced 2025-08-19 14:41:23 +02:00
Code Issues Projects Releases Wiki Activity

- applied patch for lua 5.2

Browse Source
This commit is contained in:
Mark Vejvoda
2012-04-26 00:46:49 +00:00
parent e5d1cada0e
commit 2a1ee15a54
1 changed files with 8 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
source/shared_lib/sources/lua/lua_script.cpp
View File

@@ -571,7 +571,11 @@ Vec2i LuaArguments::getVec2i(int argumentIndex) const{
throwLuaError("Can not get vec2i from Lua state, value on the stack is not a table"); throwLuaError("Can not get vec2i from Lua state, value on the stack is not a table");
} }
#if LUA_VERSION_NUM > 501
if(lua_rawlen(luaState, argumentIndex)!=2){
#else
if(luaL_getn(luaState, argumentIndex)!=2){ if(luaL_getn(luaState, argumentIndex)!=2){
#endif
throwLuaError("Can not get vec2i from Lua state, array size not 2"); throwLuaError("Can not get vec2i from Lua state, array size not 2");
} }
@@ -643,7 +647,11 @@ void LuaArguments::throwLuaError(const string &message) const{
stackString+= "String: " + string(luaL_checkstring(luaState, -i)); stackString+= "String: " + string(luaL_checkstring(luaState, -i));
} }
else if(lua_istable(luaState, -i)){ else if(lua_istable(luaState, -i)){
#if LUA_VERSION_NUM > 501
stackString+= "Table (" + intToStr(lua_rawlen(luaState, -i)) + ")";
#else
stackString+= "Table (" + intToStr(luaL_getn(luaState, -i)) + ")"; stackString+= "Table (" + intToStr(luaL_getn(luaState, -i)) + ")";
#endif
} }
else else
{ {