Changeset 8815 in orxonox.OLD for branches/single_player_map/src

Timestamp:

Jun 26, 2006, 6:26:21 PM (18 years ago)

Author:

snellen

Message:

script thestranger.lua tells thestranger to move to 288,19,208, scripttrigger is in the cell where the game starts, added debug output to find out why it doesn't work

Location:

branches/single_player_map/src

Files:

• lib/util/executor/executor_lua.h (modified) (1 diff)
• world_entities/npcs/generic_npc.cc (modified) (2 diffs)

branches/single_player_map/src/lib/util/executor/executor_lua.h

@@ -386 +386 @@
   private:
     ret           (T::*functionPointer)(type0, type1);
+};
+
+
+///////////
+//// 3 ////
+///////////
+//! Executes a Function with a lua_State* parameter.
+template<class T, typename ret, typename type0, typename type1, typename type2> class ExecutorLua3ret : public Executor
+{
+  public:
+    /**
+   * @brief Constructor of a ExecutorXML
+   * @param function a Function to call
+     */
+    ExecutorLua3ret(ret (T::*function)(type0, type1, type2))
+  : Executor(ExecutorParamType<type0>(), ExecutorParamType<type1>(), ExecutorParamType<type2>())
+    {
+      this->functionPointer = function;
+      this->functorType = Executor_Objective | Executor_NoLoadString;
+    }
+
+    /**
+     * @brief executes the Command on BaseObject
+     * @param object the BaseObject to execute this Executor on
+     * @param loadString ignored in this case
+     */
+    virtual void operator()(BaseObject* object, const SubString& = SubString()) const
+    {
+      PRINTF(1)("no usefull executor\n");
+    }
+
+    virtual void operator()(BaseObject* object, int& count, void* values) const
+    {
+      lua_State* state = (lua_State*)values;
+      count = 0;
+
+      toLua<ret>(state, (dynamic_cast<T*>(object)->*(functionPointer))(
+          fromLua<type0>(state, 1),
+      fromLua<type1>(state, 2),
+      fromLua<type2>(state, 3) ));
+    }
+
+    /**
+     * @returns a _new_ Copy of this Executor
+     */
+    virtual Executor* clone () const
+    {
+      return new ExecutorLua3ret<T, ret, type0, type1, type2>(this->functionPointer);
+    }
+  private:
+    ret          (T::*functionPointer)(type0, type1, type2);
 };
 

branches/single_player_map/src/world_entities/npcs/generic_npc.cc

@@ -40 +40 @@
 #include "script_class.h"
 CREATE_SCRIPTABLE_CLASS(GenericNPC, CL_GENERIC_NPC,
-                        addMethod("walkTo", ExecutorLua7ret<GenericNPC,float, float, float, float, float, float, float, float>(&GenericNPC::walkTo))
+                        //addMethod("walkTo", ExecutorLua7ret<GenericNPC,float, float, float, float, float, float, float, float>(&GenericNPC::walkTo))
+                        addMethod("walkTo", ExecutorLua3ret<GenericNPC,float,float,float,float>(&GenericNPC::walkTo))
                        );
 
@@ -182 +183 @@
 {
   Quaternion q = this->getAbsDir();
+  
+  printf("%s moving to %f, %f, %f \n",this->getName(),x,y,z);
 
   return this->walkTo(x, y, z, q.w, q.v.x, q.v.y, q.v.z);