Changeset 6255 in orxonox.OLD for branches/spaceshipcontrol/src/world_entities/space_ships/space_ship.cc

Timestamp:

Dec 21, 2005, 5:31:17 PM (18 years ago)

Author:

snellen

Message:

guiding_misslie.cc updated, targeting_turret added

File:

• branches/spaceshipcontrol/src/world_entities/space_ships/space_ship.cc (modified) (2 diffs)

branches/spaceshipcontrol/src/world_entities/space_ships/space_ship.cc

@@ -286 +286 @@
 
   //orient the spaceship in direction of the mouse
-   rotQuat = Quaternion::quatSlerp( this->getAbsDir(), mouseDir, fabsf(time)*3.0);
+   rotQuat = Quaternion::quatSlerp( this->getAbsDir(), mouseDir, 1);
    if (this->getAbsDir().distance(rotQuat) > 0.00000000000001)
     this->setAbsDir( rotQuat);
@@ -466 +466 @@
     //if (this->getWeaponManager()->hasFreeSlot(3))
     {
-      turret = new AimingTurret();
+      turret = dynamic_cast<Weapon*>(Factory::fabricate(CL_TARGETING_TURRET));
+      if (turret != NULL)
       this->getWeaponManager()->addWeapon(turret, 3);