Changeset 9869 in orxonox.OLD for trunk/src/lib/network/network_game_manager.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/lib/network/network_game_manager.h (modified) (1 diff)

trunk/src/lib/network/network_game_manager.h

@@ -33 +33 @@
 class NetworkGameManager: public Synchronizeable
 {
-
+  ObjectListDeclaration(NetworkGameManager);
   public:
     virtual ~NetworkGameManager();
 
-    static NetworkGameManager* NetworkGameManager::getInstance()
+    static NetworkGameManager* getInstance()
     { if (!NetworkGameManager::singletonRef) NetworkGameManager::singletonRef = new NetworkGameManager(); return NetworkGameManager::singletonRef; }