Changeset 8783 in orxonox.OLD for trunk/src/world_entities/npcs

Timestamp:

Jun 26, 2006, 2:00:31 PM (19 years ago)

Author:

patrick

Message:

merged the script engine branche back to trunk

Location:

trunk/src/world_entities/npcs

Files:

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

trunk/src/world_entities/npcs/generic_npc.cc

@@ -125 +125 @@
  * @param coordinate: coordinate to go to
  */
-bool GenericNPC::walkTo(const Vector& coordinate, float time)
+float GenericNPC::walkTo(const Vector& coordinate, const Quaternion& dir)
 {
 
@@ -136 +136 @@
  * @param coordinate: coordinate to go to
  */
-bool GenericNPC::walkTo(float x, float y, float z, float time)
+float GenericNPC::walkTo(float x, float y, float z, float qu, float qx, float qy, float qz)
 {
 

trunk/src/world_entities/npcs/generic_npc.h

@@ -38 +38 @@
   void playSound(int i);
 
-  bool walkTo(const Vector& coordinate, float time);
-  bool walkTo(float x, float y, float z, float time);
+  float walkTo(const Vector& coordinate, const Quaternion& dir);
+  float walkTo(float x, float y, float z, float qu, float qx, float qy, float qz);
+  float walkTo(float x, float y, float qu, float qx, float qy, float qz);
+
+  float runTo(const Vector& coordinate, const Quaternion& dir);
+  float runTo(float x, float y, float z, float qu, float qx, float qy, float qz);
+  float runTo(float x, float y, float qu, float qx, float qy, float qz);
+
+  float crouchTo(const Vector& coordinate, const Quaternion& dir);
+  float crouchTo(float x, float y, float z, float qu, float qx, float qy, float qz);
+  float crouchTo(float x, float y, float qu, float qx, float qy, float qz);
+
 
   void destroy();