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

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

File:

• branches/powerups/src/world_entities/space_ships/space_ship.h (modified) (2 diffs)

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