Changeset 6805 in orxonox.OLD for trunk/src/world_entities/space_ships/helicopter.cc

Timestamp:

Jan 28, 2006, 12:20:58 PM (18 years ago)

Author:

bensch

Message:

orxonox/trunk: hover works as it should

File:

• trunk/src/world_entities/space_ships/helicopter.cc (modified) (3 diffs)

trunk/src/world_entities/space_ships/helicopter.cc

@@ -259 +259 @@
 void Helicopter::collidesWith(WorldEntity* entity, const Vector& location)
 {
-  if (entity->isA(CL_TURRET_POWER_UP))
-  {
-    this->ADDWEAPON();
-    }
-//  PRINTF(3)("collision %s vs %s @ (%f,%f,%f)\n", this->getClassName(), entity->getClassName(), location.x, location.y, location.z);
 }
 
@@ -468 +463 @@
 
     glPopMatrix ();
-
-  this->getWeaponManager()->draw();
 }
 
@@ -515 +508 @@
     }
 }
-
-#include "weapons/aiming_turret.h"
-// FIXME THIS MIGHT BE CONSIDERED EITHER A FEATURE, OR A BUG
-void Helicopter::ADDWEAPON()
-{
-  Weapon* turret = NULL;
-
-  if ((float)rand()/RAND_MAX < .1)
-  {
-    //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 = new AimingTurret();
-      this->addWeapon(turret, 3);
-
-      this->getWeaponManager()->changeWeaponConfig(3);
-    }
-  }
-
-  if(turret != NULL)
-  {
-    turret->setName("Turret");
-    turret->setStateDuration(WS_SHOOTING, (float)rand()/RAND_MAX*.5+.1);
-  }
-}