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

Timestamp:

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

Author:

bensch

Message:

orxonox/trunk: merged the WeaponManager back to the trunk

File:

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

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