Changeset 9059 in orxonox.OLD for trunk/src/lib/network/network_manager.h

Timestamp:

Jul 3, 2006, 6:30:42 PM (19 years ago)

Author:

patrick

Message:

merged the network branche with the trunk

File:

• trunk/src/lib/network/network_manager.h (modified) (2 diffs)

trunk/src/lib/network/network_manager.h

@@ -40 +40 @@
 
     /** Returns the hostID @return The hostID of the object */
-    inline int getHostID() { return this->sharedNetworkData->getHostID(); }
-    inline bool isGameServer() { return this->sharedNetworkData->isGameServer(); }
+    inline int getHostID() { return SharedNetworkData::getInstance()->getHostID(); }
+    inline bool isGameServer() { return SharedNetworkData::getInstance()->isGameServer(); }
 
 
@@ -58 +58 @@
     NetworkStream*                   networkStream;       //!< pointer to network stream
 
-    SharedNetworkData*               sharedNetworkData;       //!< reference to the shared data
     float                            elapsedTime;             //!< elapsed time since the last network update
 };