diff options
| author | Thorbjørn Lindeijer <thorbjorn@lindeijer.nl> | 2013-01-08 18:03:02 +0100 |
|---|---|---|
| committer | Thorbjørn Lindeijer <thorbjorn@lindeijer.nl> | 2013-01-09 01:13:43 +0100 |
| commit | 2594084de6e163f15a1516d64cf413de5b0d899f (patch) | |
| tree | e1843432693884c40df876aa6ddc26ee5e6e78a5 /src/scripting/luautil.h | |
| parent | f8cabbd458ed3658ca0e933bd52e29d857f594e2 (diff) | |
| download | manaserv-2594084de6e163f15a1516d64cf413de5b0d899f.tar.gz manaserv-2594084de6e163f15a1516d64cf413de5b0d899f.tar.bz2 manaserv-2594084de6e163f15a1516d64cf413de5b0d899f.tar.xz manaserv-2594084de6e163f15a1516d64cf413de5b0d899f.zip | |
Added support for Lua 5.2
Should still work against Lua 5.1 as well.
Diffstat (limited to 'src/scripting/luautil.h')
| -rw-r--r-- | src/scripting/luautil.h | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/src/scripting/luautil.h b/src/scripting/luautil.h index 1ff2ab8d..0d2a981d 100644 --- a/src/scripting/luautil.h +++ b/src/scripting/luautil.h @@ -103,7 +103,12 @@ public: luaL_newmetatable(s, mTypeName); // metatable lua_pushstring(s, "__index"); // metatable, "__index" - luaL_register(s, typeName, members); // metatable, "__index", {} + lua_createtable(s, 0, 0); // metatable, "__index", {} +#if LUA_VERSION_NUM < 502 + luaL_register(s, NULL, members); +#else + luaL_setfuncs(s, members, 0); +#endif lua_rawset(s, -3); // metatable lua_pop(s, 1); // -empty- } @@ -125,8 +130,12 @@ public: void *userData = lua_newuserdata(s, sizeof(T*)); * static_cast<T**>(userData) = object; +#if LUA_VERSION_NUM < 502 luaL_newmetatable(s, mTypeName); lua_setmetatable(s, -2); +#else + luaL_setmetatable(s, mTypeName); +#endif UserDataCache::insert(s, object); } |