Changeset 6547 in orxonox.OLD for trunk/src/world_entities/space_ships

Timestamp:

Jan 18, 2006, 2:12:53 PM (18 years ago)

Author:

bensch

Message:

orxonox/trunk: merged the WeaponManager back to the trunk

Location:

trunk/src/world_entities/space_ships

Files:

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

trunk/src/world_entities/space_ships/space_ship.cc

@@ -123 +123 @@
   PRINTF(4)("SPACESHIP INIT\n");
 
-  //EventHandler::getInstance()->grabEvents(true);
+  EventHandler::getInstance()->grabEvents(true);
 
   bUp = bDown = bLeft = bRight = bAscend = bDescend = bRollL = bRollR = false;
@@ -450 +450 @@
      //this->setAbsDir(mouseDir);
   }
-}
-
-/**
- *
- */
-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;
 }
 

trunk/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);