Changeset 7001 in orxonox.OLD for trunk/src/world_entities/space_ships/space_ship.cc

Timestamp:

Feb 3, 2006, 2:18:26 AM (20 years ago)

Author:

bensch

Message:

TurbineHover is cool now

File:

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

trunk/src/world_entities/space_ships/space_ship.cc

@@ -287 +287 @@
   Playable::collidesWith(entity, location);
 
-
-  if (entity->isA(CL_TURRET_POWER_UP) && entity != ref)
-  {
-    this->ADDWEAPON();
-    ref = entity;
-  }
-
   if( entity->isA(CL_PROJECTILE) && entity != ref)
   {
@@ -501 +494 @@
 }
 
-#include "weapons/aiming_turret.h"
-// FIXME THIS MIGHT BE CONSIDERED EITHER A FEATURE, OR A BUG
-void SpaceShip::ADDWEAPON()
-{
-  Weapon* turret = NULL;
-
-  if ((float)rand()/RAND_MAX < .9)
-  {
-    //if (this->getWeaponManager()->hasFreeSlot(2, WTYPE_TURRET))
-    {
-      turret = new Turret();
-      this->addWeapon(turret, 2);
-      this->getWeaponManager()->changeWeaponConfig(2);
-    }
-  }
-  else
-  {
-    //if (this->getWeaponManager()->hasFreeSlot(3))
-    {
-      turret = dynamic_cast<Weapon*>(Factory::fabricate(CL_TARGETING_TURRET));
-      if (turret != NULL)
-      this->addWeapon(turret, 3);
-
-      this->getWeaponManager()->changeWeaponConfig(3);
-    }
-  }
-
-  if(turret != NULL)
-  {
-    turret->setName("Turret");
-    turret->setStateDuration(WS_SHOOTING, (float)rand()/RAND_MAX*.5+.1);
-  }
-}
 
 #define MASK_bUp         1