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

trunk/src/story_entities/multi_player_world.h

@@ -20 +20 @@
  */
 class MultiPlayerWorld : public GameWorld {
-
+  ObjectListDeclaration(MultiPlayerWorld);
  public:
   MultiPlayerWorld (const TiXmlElement* root = NULL);
@@ -26 +26 @@
 
   virtual void loadParams(const TiXmlElement* root);
-  
+
   virtual ErrorMessage unloadData();