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

Timestamp:

Oct 3, 2006, 12:19:30 AM (18 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/player.h (modified) (2 diffs)

trunk/src/world_entities/player.h

@@ -23 +23 @@
 class Player : public EventListener
 {
+  ObjectListDeclaration(Player);
 
   public:
@@ -31 +32 @@
     bool              eject();
     inline Playable*  getPlayable() const  { return this->playable; };
-    
+
 
      inline Hud& hud() { return this->_hud; };