Changeset 8811 in orxonox.OLD

Timestamp:

Jun 26, 2006, 5:46:42 PM (18 years ago)

Author:

snellen

Message:

executor should now be able to take up to 7 parameters

Location:

branches/single_player_map/src

Files:

• lib/util/executor/executor.cc (modified) (4 diffs)
• lib/util/executor/executor.h (modified) (3 diffs)
• lib/util/executor/functor_list.h (modified) (1 diff)
• world_entities/npcs/generic_npc.cc (modified) (2 diffs)
• world_entities/npcs/generic_npc.h (modified) (1 diff)
• world_entities/npcs/npc.cc (modified) (1 diff)

branches/single_player_map/src/lib/util/executor/executor.cc

@@ -31 +31 @@
                    const MultiType& param2,
                    const MultiType& param3,
-                   const MultiType& param4)
+                   const MultiType& param4,
+                   const MultiType& param5,
+                   const MultiType& param6)
 {
   this->setClassID(CL_EXECUTOR, "Executor");
@@ -41 +43 @@
   this->defaultValue[3] = param3;
   this->defaultValue[4] = param4;
+  this->defaultValue[5] = param5;
+  this->defaultValue[6] = param6;
 
   this->paramCount = 0;
@@ -83 +87 @@
                                   const MultiType& value2,
                                   const MultiType& value3,
-                                  const MultiType& value4)
+                                  const MultiType& value4,
+                                  const MultiType& value5,
+                                  const MultiType& value6)
 {
   if (this == NULL)
@@ -94 +100 @@
   value[3] = &value3;
   value[4] = &value4;
-
+  value[5] = &value5;
+  value[6] = &value6;
   for (unsigned int i = 0; i < this->paramCount; i++)
   {

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

@@ -47 +47 @@
     Executor* defaultValues(const MultiType& value0 = MT_NULL, const MultiType& value1 = MT_NULL,
                             const MultiType& value2 = MT_NULL, const MultiType& value3 = MT_NULL,
-                            const MultiType& value4 = MT_NULL);
+                            const MultiType& value4 = MT_NULL, const MultiType& param5 = MT_NULL,
+                            const MultiType& param6 = MT_NULL);
     /** @param i the i'th defaultValue, @returns reference to the MultiType */
     inline MultiType& getDefaultValue(unsigned int i) { return defaultValue[i]; };
@@ -68 +69 @@
     Executor(const MultiType& param0 = MT_NULL, const MultiType& param1 = MT_NULL,
              const MultiType& param2 = MT_NULL, const MultiType& param3 = MT_NULL,
-             const MultiType& param4 = MT_NULL);
+             const MultiType& param4 = MT_NULL, const MultiType& param5 = MT_NULL,
+             const MultiType& param6 = MT_NULL);
 
     void cloning(Executor* executor) const;
@@ -75 +77 @@
     short                       functorType;      //!< The type of Function we've got (either static or objective).
     unsigned int                paramCount;       //!< the count of parameters.
-    MultiType                   defaultValue[5];  //!< Default Values.
+    MultiType                   defaultValue[7];  //!< Default Values.
 };
 

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

@@ -29 +29 @@
 
 //! defines the maximum count of arguments function pointers might have
-#define FUNCTOR_MAX_ARGUMENTS                5
+#define FUNCTOR_MAX_ARGUMENTS                7
 #include "multi_type.h"
 

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

@@ -38 +38 @@
 CREATE_FACTORY(GenericNPC, CL_GENERIC_NPC);
 
+#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))
+                       );
+
 
 
@@ -52 +57 @@
 }
 
+
+GenericNPC::GenericNPC()
+  : NPC(NULL)
+{
+ 
+}
 
 /**

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

@@ -28 +28 @@
 {
  public:
+  GenericNPC();
   GenericNPC(const TiXmlElement* root);
   virtual ~GenericNPC ();

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

@@ -50 +50 @@
 void NPC::loadParams(const TiXmlElement* root)
 {
-  WorldEntity::loadParams(root);
+  if(root != NULL)
+   WorldEntity::loadParams(root);
 }