Changeset 9059 in orxonox.OLD for trunk/src/lib

Timestamp:

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

Author:

patrick

Message:

merged the network branche with the trunk

Location:

trunk/src/lib/network

Files:

• message_manager.cc (modified) (1 diff)
• network_game_manager.cc (modified) (2 diffs)
• network_manager.cc (modified) (6 diffs)
• network_manager.h (modified) (2 diffs)
• network_stream.cc (modified) (2 diffs)

trunk/src/lib/network/message_manager.cc

@@ -58 +58 @@
   
   messageQueue.clear();
+  
+  this->messageHandlerMap.clear();
+  
+  MessageManager::singletonRef = NULL;
 }
 

trunk/src/lib/network/network_game_manager.cc

@@ -77 +77 @@
   
   PlayerStats::deleteAllPlayerStats();
+  
+  NetworkGameManager::singletonRef = NULL;
 }
 
@@ -274 +276 @@
     if ( State::getPlayer()->getPlayable() != *it )
     {
-      PRINTF(0)("Delete unused playable: %s owner: %d\n", (*it)->getClassName(), (*it)->getOwner() );
-      std::list<Playable*>::iterator delit = it;
-      it++;
-      delete *delit;
-      playablesToDelete.erase( delit );
-      continue;
+      const std::list<BaseObject*> * list = ClassList::getList( CL_PLAYABLE );
+       
+      if ( list && std::find( list->begin(), list->end(), *it ) != list->end() )
+      {      
+        PRINTF(0)("Delete unused playable: %s owner: %d\n", (*it)->getClassName(), (*it)->getOwner() );
+        std::list<Playable*>::iterator delit = it;
+        it++;
+        delete *delit;
+        playablesToDelete.erase( delit );
+        continue;
+      }
     }
     it++;

trunk/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 )
   {
@@ -75 +75 @@
     this->networkStream = NULL;
   }
+  
+  NetworkManager::singletonRef = NULL;
 }
 
@@ -103 +105 @@
 {
   this->networkStream = new NetworkStream( name, port );
-  this->sharedNetworkData->setDefaultSyncStream(this->networkStream);
+  SharedNetworkData::getInstance()->setDefaultSyncStream(this->networkStream);
   this->networkStream->startHandshake();
   return 1;
@@ -115 +117 @@
 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");
@@ -144 +146 @@
   this->elapsedTime = 0.0f;
 
-//  if ( networkStream->isActive() )
+  if ( networkStream )
     networkStream->processData();
   

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
 };

trunk/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 );