Changeset 8811 in orxonox.OLD for branches/single_player_map/src/world_entities

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/world_entities/npcs

Files:

• generic_npc.cc (modified) (2 diffs)
• generic_npc.h (modified) (1 diff)
• npc.cc (modified) (1 diff)

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);
 }