Changeset 9041 in orxonox.OLD for branches/multi_player_map/src/lib

Timestamp:

Jul 3, 2006, 3:30:01 PM (18 years ago)

Author:

rennerc

Message:

bug—

Location:

branches/multi_player_map/src/lib/network

Files:

• network_manager.cc (modified) (4 diffs)
• network_manager.h (modified) (2 diffs)
• network_stream.cc (modified) (2 diffs)

branches/multi_player_map/src/lib/network/network_manager.cc

@@ -52 +52 @@
   /* initialize the references */
   this->networkStream = NULL;
-  this->sharedNetworkData = SharedNetworkData::getInstance();
   this->elapsedTime = 0.0f;
   
@@ -70 +69 @@
 NetworkManager::~NetworkManager()
 {
+  PRINTF(0)("NetworkManager destructor\n");
   if ( this->networkStream )
   {
@@ -103 +103 @@
 {
   this->networkStream = new NetworkStream( name, port );
-  this->sharedNetworkData->setDefaultSyncStream(this->networkStream);
+  SharedNetworkData::getInstance()->setDefaultSyncStream(this->networkStream);
   this->networkStream->startHandshake();
   return 1;
@@ -115 +115 @@
 int NetworkManager::createServer(unsigned int port)
 {
-  this->sharedNetworkData->setHostID(0);
-  this->sharedNetworkData->setGameServer(true);
+  SharedNetworkData::getInstance()->setHostID(0);
+  SharedNetworkData::getInstance()->setGameServer(true);
   this->networkStream = new NetworkStream(port);
-  this->sharedNetworkData->setDefaultSyncStream(this->networkStream);
+  SharedNetworkData::getInstance()->setDefaultSyncStream(this->networkStream);
   this->networkStream->createNetworkGameManager();
   PRINTF(0)("CREATE SERVER\n");

branches/multi_player_map/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
 };

branches/multi_player_map/src/lib/network/network_stream.cc

@@ -111 +111 @@
     serverSocket = NULL;
   }
-
   for ( PeerList::iterator i = peers.begin(); i!=peers.end(); i++)
   {
@@ -133 +132 @@
     }
   }
-  
   for ( SynchronizeableList::const_iterator it = getSyncBegin(); it != getSyncEnd(); it ++ )
     (*it)->setNetworkStream( NULL );