Changeset 8306 in orxonox.OLD for branches/network

Timestamp:

Jun 10, 2006, 11:15:35 AM (19 years ago)

Author:

rennerc

Message:

memoryleak—

Location:

branches/network/src/lib/network

Files:

• network_game_manager.cc (modified) (1 diff)
• synchronizeable.cc (modified) (2 diffs)

branches/network/src/lib/network/network_game_manager.cc

@@ -194 +194 @@
   
   assert( Converter::intToByteArray( uniqueId, buf, INTSIZE ) == INTSIZE );
-  
+
   MessageManager::getInstance()->sendMessage( MSGID_DELETESYNCHRONIZEABLE, buf, INTSIZE, RT_ALL_NOT_ME, 0, MP_HIGHBANDWIDTH );
 }

branches/network/src/lib/network/synchronizeable.cc

@@ -70 +70 @@
     this->networkStream->disconnectSynchronizeable(*this);
   
-  if ( this->isServer() && this->beSynchronized() && this->getUniqueID() > 0 )
+  if ( this->isServer() && this->beSynchronized() && this->getUniqueID() > 0 && !this->isA( CL_MESSAGE_MANAGER ) )
     NetworkGameManager::getInstance()->removeSynchronizeable( this->getUniqueID() );
     
@@ -226 +226 @@
             (*it)->checkPermission( PERMISSION_ALL ) 
                     );
-    if ( sizeIter != stateFrom->sizeList.end() || *sizeIter != (*it)->getSize() ) 
+    
+    if ( sizeIter != stateFrom->sizeList.end() || ( sizeIter != stateFrom->sizeList.end() && *sizeIter != (*it)->getSize() ) ) 
       sizeChanged = true;