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

Timestamp:

Dec 7, 2005, 3:45:26 PM (19 years ago)

Author:

manuel

Message:

many changes:
created generic weapon_power_up that can contain any kind of weapon
space_ship is now extendable and can pickup weapon_power_ups

Location:

branches/powerups/src/world_entities/space_ships

Files:

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

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

@@ -17 +17 @@
 #define DEBUG_SPECIAL_MODULE DEBUG_MODULE_WORLD_ENTITY
 
+#include "space_ship.h"
+
 #include "executor/executor.h"
-#include "space_ship.h"
 
 #include "objModel.h"
@@ -30 +31 @@
 #include "factory.h"
 #include "key_mapper.h"
+
+#include "power_ups/weapon_power_up.h"
 
 using namespace std;
@@ -368 +371 @@
 }
 
+/**
+ *
+ */
+bool SpaceShip::pickup(PowerUp* powerUp)
+{
+  if(powerUp->isA(CL_WEAPON_POWER_UP)) {
+    WeaponPowerUp* wpu = dynamic_cast<WeaponPowerUp*>(powerUp);
+    WeaponManager* manager = this->getWeaponManager();
+    int slot = manager->getNextFreeSlot(0, wpu->getCapsNeeded());
+    if(slot >= 0) {
+      manager->addWeapon(wpu->getWeapon(), 0, slot);
+      return true;
+    }
+  }
+  else if(powerUp->isA(CL_SHIELD_POWER_UP)) {
+
+  }
+  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

@@ -8 +8 @@
 
 #include "playable.h"
+#include "extendable.h"
 
 template<class T> class tList;
@@ -13 +14 @@
 class Event;
 
-class SpaceShip : public Playable
+class SpaceShip : public Playable, public Extendable
 {
 
@@ -37 +38 @@
 
     virtual void process(const Event &event);
+
+    bool pickup(PowerUp* powerUp);