Changeset 9869 in orxonox.OLD for trunk/src/world_entities/satellite.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/satellite.h (modified) (2 diffs)

trunk/src/world_entities/satellite.h

@@ -9 +9 @@
 #include "world_entity.h"
 #include "comincl.h"
-#include "util/loading/resource_manager.h"
-
 
 class CharacterAttributes;
@@ -19 +17 @@
 class Satellite : public WorldEntity
 {
-  friend class World;
+  ObjectListDeclaration(Satellite);
 
  public: