Changeset 8687 in orxonox.OLD

Timestamp:

Jun 21, 2006, 10:13:44 PM (18 years ago)

Author:

patrick

Message:

bsp: fps player worky

File:

• branches/bsp_model/src/world_entities/creatures/fps_player.cc (modified) (6 diffs)

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

@@ -23 +23 @@
 
 #include "key_mapper.h"
+
+#include "debug.h"
 
 
@@ -84 +86 @@
   registerEvent(KeyMapper::PEV_RIGHT);
   registerEvent(KeyMapper::PEV_FIRE1);
+  registerEvent(KeyMapper::PEV_JUMP);
   registerEvent(EV_MOUSE_MOTION);
 
@@ -101 +104 @@
 
   // collision reaction registration
-  this->subscribeReaction(CREngine::CR_PHYSICS_GROUND_WALK, CL_BSP_ENTITY);
+  //this->subscribeReaction(CREngine::CR_PHYSICS_GROUND_WALK, CL_BSP_ENTITY);
 }
 
@@ -157 +160 @@
   Playable::tick( time );
 
-  if( ( xMouse != 0 || yMouse != 0 ) && this->getOwner() == this->getHostID() )
-  {
-    xMouse *= time / 10;
-    yMouse *= time / 10;
+  if( ( xMouse != 0 || yMouse != 0 ) && /*this->getOwner() == this->getHostID()*/ true)
+  {
+    xMouse *= time ;
+    yMouse *= time ;
 
     angleX -= xMouse;
@@ -207 +210 @@
 
 
-  if( likely(this->getModel(0) != NULL) && this->getModel(0)->isA(CL_INTERACTIVE_MODEL))
-  {
-    ((InteractiveModel*)this->getModel(0))->tick(time);
-
-    // handle animations differently
-    if( this->bJump && likely(this->getModel(0) != NULL))
-    {
-      ((InteractiveModel*)this->getModel(0))->setAnimation(JUMP);
-    }
+//   if( likely(this->getModel(0) != NULL) && this->getModel(0)->isA(CL_INTERACTIVE_MODEL))
+//   {
+//     ((InteractiveModel*)this->getModel(0))->tick(time);
+//
+//     // handle animations differently
+//     if( this->bJump && likely(this->getModel(0) != NULL))
+//     {
+//       ((InteractiveModel*)this->getModel(0))->setAnimation(JUMP);
+//     }
 //     else if( this->bFire && likely(this->getModel(0) != NULL))
 //     {
@@ -226 +229 @@
 //         ((InteractiveModel*)this->getModel(0))->setAnimation(RUN);
 //     }
-    else if (likely(this->getModel(0) != NULL))
-    {
-      if( ((InteractiveModel*)this->getModel(0))->getAnimation() != STAND)
-        ((InteractiveModel*)this->getModel(0))->setAnimation(STAND);
-    }
-  }
+//     else if (likely(this->getModel(0) != NULL))
+//     {
+//       if( ((InteractiveModel*)this->getModel(0))->getAnimation() != STAND)
+//         ((InteractiveModel*)this->getModel(0))->setAnimation(STAND);
+//     }
+//   }
 
 }