gesche
/
tibia-client
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fixes to lua

This commit is contained in:
Henrique Santiago 2013-02-10 02:05:02 -02:00
parent dfb0150a7d
commit b1bab32618
2 changed files with 17 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/framework/luaengine/luainterface.h
View File

@ -189,7 +189,10 @@ public:
int newSandboxEnv(); int newSandboxEnv();
template<typename... T> template<typename... T>
int callGlobalField(const std::string& global, const std::string& field, const T&... args); int luaCallGlobalField(const std::string& global, const std::string& field, const T&... args);
template<typename... T>
void callGlobalField(const std::string& global, const std::string& field, const T&... args);
template<typename R, typename... T> template<typename R, typename... T>
R callGlobalField(const std::string& global, const std::string& field, const T&... args); R callGlobalField(const std::string& global, const std::string& field, const T&... args);
@ -425,7 +428,7 @@ T LuaInterface::castValue(int index) {
} }
template<typename... T> template<typename... T>
int LuaInterface::callGlobalField(const std::string& global, const std::string& field, const T&... args) { int LuaInterface::luaCallGlobalField(const std::string& global, const std::string& field, const T&... args) {
g_lua.getGlobalField(global, field); g_lua.getGlobalField(global, field);
if(!g_lua.isNil()) { if(!g_lua.isNil()) {
int numArgs = g_lua.polymorphicPush(args...); int numArgs = g_lua.polymorphicPush(args...);
@ -435,10 +438,17 @@ int LuaInterface::callGlobalField(const std::string& global, const std::string&
return 0; return 0;
} }
template<typename... T>
void LuaInterface::callGlobalField(const std::string& global, const std::string& field, const T&... args) {
int rets = luaCallGlobalField(global, field, args...);
if(rets > 0)
pop(rets);
}
template<typename R, typename... T> template<typename R, typename... T>
R LuaInterface::callGlobalField(const std::string& global, const std::string& field, const T&... args) { R LuaInterface::callGlobalField(const std::string& global, const std::string& field, const T&... args) {
R result; R result;
int rets = callGlobalField(global, field, args...); int rets = luaCallGlobalField(global, field, args...);
if(rets > 0) { if(rets > 0) {
assert(rets == 1); assert(rets == 1);
result = g_lua.polymorphicPop<R>(); result = g_lua.polymorphicPop<R>();

8
src/framework/luaengine/luaobject.h
View File

@ -40,7 +40,7 @@ public:
/// if any lua error occurs, it will be reported to stdout and return 0 results /// if any lua error occurs, it will be reported to stdout and return 0 results
/// @return the number of results /// @return the number of results
template<typename... T> template<typename... T>
int luaCallField(const std::string& field, const T&... args); int luaCallLuaField(const std::string& field, const T&... args);
template<typename R, typename... T> template<typename R, typename... T>
R callLuaField(const std::string& field, const T&... args); R callLuaField(const std::string& field, const T&... args);
@ -149,7 +149,7 @@ connect(const LuaObjectPtr& obj, const std::string& field, const Lambda& f, bool
} }
template<typename... T> template<typename... T>
int LuaObject::luaCallField(const std::string& field, const T&... args) { int LuaObject::luaCallLuaField(const std::string& field, const T&... args) {
// note that the field must be retrieved from this object lua value // note that the field must be retrieved from this object lua value
// to force using the __index metamethod of it's metatable // to force using the __index metamethod of it's metatable
// so cannot use LuaObject::getField here // so cannot use LuaObject::getField here
@ -171,7 +171,7 @@ int LuaObject::luaCallField(const std::string& field, const T&... args) {
template<typename R, typename... T> template<typename R, typename... T>
R LuaObject::callLuaField(const std::string& field, const T&... args) { R LuaObject::callLuaField(const std::string& field, const T&... args) {
R result; R result;
int rets = luaCallField(field, args...); int rets = luaCallLuaField(field, args...);
if(rets > 0) { if(rets > 0) {
assert(rets == 1); assert(rets == 1);
result = g_lua.polymorphicPop<R>(); result = g_lua.polymorphicPop<R>();
@ -182,7 +182,7 @@ R LuaObject::callLuaField(const std::string& field, const T&... args) {
template<typename... T> template<typename... T>
void LuaObject::callLuaField(const std::string& field, const T&... args) { void LuaObject::callLuaField(const std::string& field, const T&... args) {
int rets = luaCallField(field, args...); int rets = luaCallLuaField(field, args...);
if(rets > 0) if(rets > 0)
g_lua.pop(rets); g_lua.pop(rets);
} }