Changeset 8796 in orxonox.OLD for trunk/src/world_entities

Timestamp:

Jun 26, 2006, 3:43:40 PM (19 years ago)

Author:

patrick

Message:

merged the bsp model branche back to trunk and some npc code changes

File:

• trunk/src/world_entities/npcs/generic_npc.h (modified) (2 diffs)

trunk/src/world_entities/npcs/generic_npc.h

@@ -15 +15 @@
 
 #include "vector.h"
-#include "qaternion.h"
+#include "quaternion.h"
 
 
@@ -56 +56 @@
   float crouchTo(float x, float y, float qu, float qx, float qy, float qz);
 
-  float talkTo(WorldEnity* worldEntity, int dialogNr);
+  float talkTo(WorldEntity* worldEntity, int dialogNr);