Changeset 9065 in orxonox.OLD for branches/presentation/src/world_entities/npcs

Timestamp:

Jul 3, 2006, 7:22:44 PM (18 years ago)

Author:

patrick

Message:

ground collision works again

File:

• branches/presentation/src/world_entities/npcs/generic_npc.cc (modified) (4 diffs)

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

@@ -93 +93 @@
 
   // collision reaction registration
-//   this->subscribeReaction(CREngine::CR_PHYSICS_GROUND_WALK, CL_BSP_ENTITY);
+   this->subscribeReaction(CREngine::CR_PHYSICS_GROUND_WALK, CL_BSP_ENTITY);
 }
 
@@ -194 +194 @@
 void GenericNPC::resume()
 {
-  //if()
+  if( this->animationStack.size() == 0)
+    return;
+
   delete this->behaviourList;
   this->behaviourList = this->animationStack.top();
@@ -518 +520 @@
       {
         Vector dest = currentAnimation.v - this->getAbsCoor();
+        dest.y = 0.0f;
         if (dest.len() < .5)
           this->nextStep();
@@ -530 +533 @@
       {
         Vector dest = currentAnimation.v - this->getAbsCoor();
+        dest.y = 0.0f;
         if (dest.len() < .5)
           this->nextStep();