Changeset 5745 in orxonox.OLD for branches/world_entities/src/world_entities/weapons/turret.cc

Timestamp:

Nov 23, 2005, 9:41:24 PM (18 years ago)

Author:

bensch

Message:

orxonox/trunk: removed WeaponManager from all the Weapons, because weapon should not know where it is connected to

File:

• branches/world_entities/src/world_entities/weapons/turret.cc (modified) (4 diffs)

branches/world_entities/src/world_entities/weapons/turret.cc

@@ -40 +40 @@
    creates a new weapon
 */
-Turret::Turret (WeaponManager* weaponManager)
-  : Weapon(weaponManager)
+Turret::Turret ()
+  : Weapon()
 {
   this->init();
@@ -117 +117 @@
 {
   Quaternion quat;
-  Vector direction = this->getWeaponManager()->getFixedTarget()->getAbsCoor() - this->getAbsCoor();
+  Vector direction = this->getAbsCoor();/*this->getWeaponManager()->getFixedTarget()->getAbsCoor() - this->getAbsCoor();*/
 
   direction.normalize();
@@ -135 +135 @@
     return;
 
-  PNode* target = this->getWeaponManager()->getFixedTarget();
-
-  if (target != NULL)
-  {
     pj->setVelocity(this->getVelocity()+(this->getAbsDir().apply(Vector(1,0,0))*100.0 + VECTOR_RAND(13)
             /*target->getAbsCoor() - this->getAbsCoor()*/)*.5);//this->getVelocity());
-  }
-  else
-    pj->setVelocity(target->getVelocity());
 
   pj->setParent(NullParent::getInstance());
@@ -159 +152 @@
 void Turret::draw () const
 {
-  this->getWeaponManager()->getFixedTarget()->debugDraw(10);
-
   /* draw gun body */
   glMatrixMode(GL_MODELVIEW);