Changeset 9027 in orxonox.OLD for trunk

Timestamp:

Jul 3, 2006, 11:30:17 AM (18 years ago)

Author:

patrick

Message:

npc does not yet move again. strange

Location:

trunk/src

Files:

• lib/collision_reaction/cr_object_damage.cc (modified) (1 diff)
• lib/collision_reaction/cr_physics_ground_walk.cc (modified) (1 diff)
• story_entities/game_world.cc (modified) (1 diff)
• world_entities/npcs/generic_npc.cc (modified) (2 diffs)

trunk/src/lib/collision_reaction/cr_object_damage.cc

@@ -56 +56 @@
   float damage = 0.0f;
 
-  PRINTF(4)("Dealing damage - Handling collision: %s vs %s\n",
+  PRINTF(0)("Dealing damage - Handling collision: %s vs %s\n",
             collision->getEntityA()->getClassName(),
             collision->getEntityB()->getClassName());

trunk/src/lib/collision_reaction/cr_physics_ground_walk.cc

@@ -127 +127 @@
         {
           entity->setAbsCoor(entity->getLastAbsCoor());
+          PRINTF(0)("ground collision: reset pos\n");
         }
         else

trunk/src/story_entities/game_world.cc

@@ -308 +308 @@
     /* update the state */
     //this->update (); /// LESS REDUNDANCY.
-//     PNode::getNullParent()->updateNode(this->dtS);
+//      PNode::getNullParent()->updateNode(this->dtS);
 
 

trunk/src/world_entities/npcs/generic_npc.cc

@@ -185 +185 @@
 void GenericNPC::initNPC()
 {
+
+  this->unsubscribeReaction();
+
   if (!this->behaviourList.empty())
   {
@@ -473 +476 @@
           Vector dest = currentAnimation.v - this->getAbsCoor();
           if (dest.len() < .5)
+          {
             this->nextStep();
+          }
           else
           {
             dest.y = 0.0f;
             this->shiftCoor(dest.getNormalized() * currentAnimation.speed * dt);
-
           }
         }