Changeset 9048 in orxonox.OLD

Timestamp:

Jul 3, 2006, 4:33:18 PM (18 years ago)

Author:

rennerc

Message:

removed some bugs

Location:

branches/multi_player_map/src/lib/network

Files:

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

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

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

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

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

@@ -75 +75 @@
     this->networkStream = NULL;
   }
+  
+  NetworkManager::singletonRef = NULL;
 }
 
@@ -144 +146 @@
   this->elapsedTime = 0.0f;
 
-//  if ( networkStream->isActive() )
+  if ( networkStream )
     networkStream->processData();