Changeset 6243 in orxonox.OLD for trunk/src/world_entities/space_ships/space_ship.h

Timestamp:

Dec 21, 2005, 3:41:11 PM (20 years ago)

Author:

bensch

Message:

orxonox/trunk: merged the power-ups to the tunk again

File:

• trunk/src/world_entities/space_ships/space_ship.h (modified) (3 diffs)

trunk/src/world_entities/space_ships/space_ship.h

@@ -8 +8 @@
 
 #include "playable.h"
+#include "extendable.h"
 
 
@@ -14 +15 @@
 class Event;
 
-class SpaceShip : public Playable
+class SpaceShip : public Playable, public Extendable
 {
 
@@ -41 +42 @@
 
     virtual void process(const Event &event);
-
+    bool pickup(PowerUp* powerUp);