Changeset 10287 in orxonox.OLD for branches/heathaze

Timestamp:

Jan 17, 2007, 10:33:59 PM (18 years ago)

Author:

snellen

Message:

some fixes

Location:

branches/heathaze/src/world_entities

Files:

• creatures/fps_player.cc (modified) (1 diff)
• script_trigger.cc (modified) (1 diff)

branches/heathaze/src/world_entities/creatures/fps_player.cc

@@ -358 +358 @@
   if( this->bJump && likely(this->getModel(0) != NULL))
   {
-    if( this->jumpForce < 1.0f)
-    {
-      this->jumpForce = 300.0f;
-
-      if( ((InteractiveModel*)this->getModel(0))->getAnimation() != JUMP)
-        ((InteractiveModel*)this->getModel(0))->setAnimation(JUMP);
-    }
+    printf("pedestrianOne:walkTo( %f, 35, %f) \n", this->getAbsCoor().x, this->getAbsCoor().z);
+    this->bJump = false;
+    //if( this->jumpForce < 1.0f)
+    //{
+      //this->jumpForce = 300.0f;
+
+    //  if( ((InteractiveModel*)this->getModel(0))->getAnimation() != JUMP)
+      //  ((InteractiveModel*)this->getModel(0))->setAnimation(JUMP);
+  //}
   }
   else if(velocity.len() != 0.0f)

branches/heathaze/src/world_entities/script_trigger.cc

@@ -188 +188 @@
   if( !invert && this->distance(target) < radius)
   {
+  //  printf("Trigger position is: %f %f %f \n", this->getAbsCoor().x, this->getAbsCoor().y, this->getAbsCoor().z);
+  //  printf("Target position is: %f %f %f \n", this->target->getAbsCoor().x, this->target->getAbsCoor().y, this->target->getAbsCoor().z);
     executeAction(timestep);
     scriptCalled = true;