Changeset 6487 in orxonox.OLD for branches/powerups/src/world_entities/space_ships

Timestamp:

Jan 11, 2006, 4:18:14 PM (18 years ago)

Author:

manuel

Message:

moved pickup from spaceship to playable. playable can now pickup health and max-health powerups

Location:

branches/powerups/src/world_entities/space_ships

Files:

• space_ship.cc (modified) (1 diff)
• space_ship.h (modified) (2 diffs)

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

@@ -452 +452 @@
 }
 
-/**
- *
- */
-bool SpaceShip::pickup(PowerUp* powerUp)
-{
-  if(powerUp->isA(CL_WEAPON_POWER_UP)) {
-    Weapon* weapon = dynamic_cast<WeaponPowerUp*>(powerUp)->getWeapon();
-    WeaponManager* manager = this->getWeaponManager();
-    int slot = manager->getNextFreeSlot(0, weapon->getCapability());
-    if(slot >= 0) {
-      manager->addWeapon(weapon, 0, slot);
-      return true;
-    }
-  }
-  else if(powerUp->isA(CL_PARAM_POWER_UP)) {
-    ParamPowerUp* ppu = dynamic_cast<ParamPowerUp*>(powerUp);
-    switch(ppu->getType()) {
-      case PARAM_SHIELD:
-        break;
-    }
-  }
-  return false;
-}
-
 #include "weapons/aiming_turret.h"
 // FIXME THIS MIGHT BE CONSIDERED EITHER A FEATURE, OR A BUG

branches/powerups/src/world_entities/space_ships/space_ship.h

@@ -15 +15 @@
 class Event;
 
-class SpaceShip : public Playable, public Extendable
+class SpaceShip : public Playable
 {
 
@@ -39 +39 @@
 
     virtual void process(const Event &event);
-    bool pickup(PowerUp* powerUp);
 
     virtual int       writeBytes(const byte* data, int length, int sender);