Changeset 10326 in orxonox.OLD

Timestamp:

Jan 24, 2007, 11:32:13 AM (18 years ago)

Author:

patrick

Message:

fixed a segfault in the fps player

File:

• trunk/src/world_entities/creatures/fps_player.cc (modified) (4 diffs)

trunk/src/world_entities/creatures/fps_player.cc

@@ -166 +166 @@
   this->initWeapon = false;
   this->damageTicker = 0.0f;
+
 }
 
@@ -241 +242 @@
 
 
-    if( this->aimingSystem != NULL)
-    {
-      this->aimingSystem->toList(OM_GROUP_01);
-      this->aimingSystem->setParent(&this->cameraNode);
-  //     this->aimingSystem->setParentMode(PNODE_ROTATE_AND_MOVE);
-      this->aimingSystem->setRelDir(Quaternion(M_PI_4*-0.58f, Vector(0,0,1)));
-      this->aimingSystem->setRelCoor(0, -1, -1);
-    }
+//     if( this->aimingSystem != NULL)
+//     {
+//       this->aimingSystem->toList(OM_GROUP_01);
+//       this->aimingSystem->setParent(&this->cameraNode);
+//   //     this->aimingSystem->setParentMode(PNODE_ROTATE_AND_MOVE);
+//       this->aimingSystem->setRelDir(Quaternion(M_PI_4*-0.58f, Vector(0,0,1)));
+//       this->aimingSystem->setRelCoor(0, -1, -1);
+//     }
 
 
@@ -341 +342 @@
   velocity *= 100;
 
-  if( this->bJump && likely(this->getModel(0) != NULL))
-  {
-    if( this->jumpForce < 1.0f)
+  if( this->getModel( 0) != NULL)
+  {
+    if( this->bJump)
     {
-      this->jumpForce = 300.0f;
-
-      if( ((InteractiveModel*)this->getModel(0))->getAnimation() != JUMP)
-        ((InteractiveModel*)this->getModel(0))->setAnimation(JUMP);
+      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)
-  {
-    if( ((InteractiveModel*)this->getModel(0))->getAnimation() != RUN)
-      ((InteractiveModel*)this->getModel(0))->setAnimation(RUN);
-  }
-  else
-  {
-    if( ((InteractiveModel*)this->getModel(0))->getAnimation() != STAND)
-      ((InteractiveModel*)this->getModel(0))->setAnimation(STAND);
+    else if(velocity.len() != 0.0f)
+    {
+      if( ((InteractiveModel*)this->getModel(0))->getAnimation() != RUN)
+        ((InteractiveModel*)this->getModel(0))->setAnimation(RUN);
+    }
+    else
+    {
+      if( ((InteractiveModel*)this->getModel(0))->getAnimation() != STAND)
+        ((InteractiveModel*)this->getModel(0))->setAnimation(STAND);
+    }
   }
 
@@ -395 +399 @@
 
   this->setOnGround(false);
-  this->aimingSystem->flushList();
+  if( this->aimingSystem != NULL)
+    this->aimingSystem->flushList();
 }