Changeset 8271 in orxonox.OLD for trunk/src/lib/script_engine/lunar.h

Timestamp:

Jun 8, 2006, 4:50:50 PM (18 years ago)

Author:

bensch

Message:

merge

File:

• trunk/src/lib/script_engine/lunar.h (modified) (4 diffs)

trunk/src/lib/script_engine/lunar.h

@@ -3 +3 @@
 
 #include <string>
-#include "Script.h"
+#include <cassert>
+#include "script.h"
 
 #include "luaincl.h"
+#include "executor/executor_lua.h"
 
 
@@ -12 +14 @@
       typedef struct { T *pT; } userdataType;
     public:
-      typedef int (T::*mfp)(lua_State *L);
+      typedef Executor* mfp;
       typedef struct { const char *name; mfp mfunc; } RegType;
 
@@ -139 +141 @@
       static int insertObject(Script* script, T* obj, const std::string& name, bool gc=false)
       {
-        if(script != NULL)
-          return insertObject(script->getLuaState(), obj, name, gc);
-
-
+        assert (script != NULL);
+        return insertObject(script->getLuaState(), obj, name, gc);
       }
 
@@ -163 +163 @@
         // get member function from upvalue
         RegType *l = static_cast<RegType*>(lua_touserdata(L, lua_upvalueindex(1)));
-        return (obj->*(l->mfunc))(L);  // call member function
+        int value;
+        (*l->mfunc)(obj, value, L);  // call member function
+        return value;
       }