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

Timestamp:

Oct 3, 2006, 12:19:30 AM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: merged the new_class_id branche back to the trunk.
merged with command:
svn merge ​https://svn.orxonox.net/orxonox/branches/new_class_id trunk -r9683:HEAD
no conflicts… puh..

File:

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

trunk/src/world_entities/space_ships/space_ship.h

@@ -19 +19 @@
 class SpaceShip : public Playable
 {
+  ObjectListDeclaration(SpaceShip);
 
   public:
@@ -36 +37 @@
     virtual void postSpawn();
     virtual void leftWorld();
-    
+
     virtual void destroy(WorldEntity* killer);
     virtual void respawn();