Changeset 10316 in orxonox.OLD

Timestamp:

Jan 24, 2007, 1:12:07 AM (18 years ago)

Author:

patrick

Message:

fixed the fps loading problem. shaking still on

File:

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

trunk/src/world_entities/creatures/fps_player.cc

@@ -124 +124 @@
   dynamic_cast<Element2D*>(this->getWeaponManager().getFixedTarget())->setVisibility( false);
 
-  Weapon* wpRight = new FPSSniperRifle(0);
-  wpRight->setName("testGun Right");
-/*  Weapon* wpLeft = new TestGun(1);*/
-//   Weapon* wpLeft = new Turret();
-//   wpLeft->setName("testGun Left");
-
-//   this->addWeapon(wpLeft, 1, 0);
   if( State::isOnline())
+  {
+    Weapon* wpRight = new FPSSniperRifle(0);
+    wpRight->setName("testGun Right");
     this->addWeapon(wpRight,1, 0);
+
+    this->aimingSystem = new AimingSystem(this);
+    wpRight->addChild(this->aimingSystem);
+
+    this->toList( OM_PLAYERS );
+  }
+
+
   this->getWeaponManager().changeWeaponConfig(1);
-
   this->getWeaponManager().setSlotCount(2);
   this->getWeaponManager().setSlotDirection(0, Quaternion(M_PI_4*-0.55f, Vector(0,0,1)));
@@ -142 +145 @@
   this->getWeaponManager().setSlotPosition(1, Vector(5.0, 0.0, 0.0));
 
-//   this->getWeaponManager().getFixedTarget()->setRelDir(Quaternion(M_PI_4*-0.6f, Vector(0,0,1)));
-
-
   this->getWeaponManager().setParentNode(&this->cameraNode);
   this->cameraNode.addNodeFlags(PNODE_PROHIBIT_CHILD_DELETE);
@@ -150 +150 @@
   this->getWeaponManager().getFixedTarget()->setParent(&this->cameraNode);
   this->getWeaponManager().getFixedTarget()->setRelCoor(1000,0,0);
-
-  this->aimingSystem = new AimingSystem(this);
-  //this->addChild(this->aimingSystem);
-  wpRight->addChild(this->aimingSystem);
-//   this->getWeaponManager().sl
 
 
@@ -171 +166 @@
   this->initWeapon = false;
   this->damageTicker = 0.0f;
-
-  if( State::isOnline())
-    toList( OM_PLAYERS );
 }
 
@@ -185 +177 @@
   Playable::loadParams(root);
 }
+
 
 void FPSPlayer::setPlayDirection(const Quaternion& quat, float speed)