Changeset 8952 in orxonox.OLD for branches/single_player_map/src

Timestamp:

Jun 30, 2006, 2:04:53 PM (18 years ago)

Author:

snellen

Message:

corrected typo

Location:

branches/single_player_map/src

Files:

• lib/collision_reaction/cr_physics_ground_walk.cc (modified) (2 diffs)
• world_entities/creatures/fps_player.cc (modified) (3 diffs)
• world_entities/creatures/fps_player.h (modified) (1 diff)
• world_entities/npcs/generic_npc.cc (modified) (2 diffs)

branches/single_player_map/src/lib/collision_reaction/cr_physics_ground_walk.cc

@@ -77 +77 @@
   float side = 0;
 
-  PRINTF(0)("collision raction======================================\n");
+  //PRINTF(0)("collision raction======================================\n");
 
   const std::vector<CollisionEvent*>* collisionEvents = &(collision->getCollisionEvents());
@@ -155 +155 @@
     }
   }
-  PRINTF(0)("collision distances: x: %f, y: %f, z: %f\n", front, height, side);
+  //PRINTF(0)("collision distances: x: %f, y: %f, z: %f\n", front, height, side);
 
 

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

@@ -83 +83 @@
   this->bBackward = false;
   this->bJump = false;
+  this->bPosBut = false;
 
   this->xMouse = 0.0f;
@@ -206 +207 @@
 void FPSPlayer::tick (float time)
 {
+  
+  if( this->bPosBut)
+  {
+    this->bPosBut = false;
+    printf("guard:walkTo( %f, height, %f)\n",this->getAbsCoorX(),this->getAbsCoorZ());
+  }
+  
   Playable::tick( time );
 
@@ -339 +347 @@
   }
   else if( event.type == KeyMapper::PEV_JUMP)
-    this->getAbsCoor().debug();
-}
-
-
-
-
+    this->bPosBut = event.bPressed;
+}
+
+
+
+

branches/single_player_map/src/world_entities/creatures/fps_player.h

@@ -42 +42 @@
     bool                  bBackward;
     bool                  bJump;              //!< jumping
+    bool                  bPosBut;             //!< position button
 
     float                 xMouse;             //!< mouse moved in x-Direction

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

@@ -224 +224 @@
 void GenericNPC::walkTo(float x, float y, float z)
 {
-  printf("Walking to %f, %f, %f \n",x,y,z);
+  //printf("Walking to %f, %f, %f \n",x,y,z);
   this->walkTo(Vector(x,y,z));
 
@@ -337 +337 @@
           else
           {
-            this->shiftCoor(dir.getNormalized() * currentAnimation.speed dt);
+            this->shiftCoor(dir.getNormalized() * currentAnimation.speed * dt);
           }
         }