Changeset 8623 in orxonox.OLD for trunk/src/lib/network/synchronizeable.cc

Timestamp:

Jun 20, 2006, 1:39:01 PM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: merged the network branche back here
merged with command:
svn merge -r8230:HEAD ​https://svn.orxonox.net/orxonox/branches/network .
conflicts resolved in favour of the network branche (conflicts were in network)

File:

• trunk/src/lib/network/synchronizeable.cc (modified) (11 diffs)

trunk/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() );
+    
+  for ( SyncVarList::iterator it = syncVarList.begin(); it != syncVarList.end(); it++ )
+  {
+    delete *it;
+  }
+  syncVarList.clear();
+  
+  for ( UserStateHistory::iterator it = recvStates.begin(); it != recvStates.end(); it++ )
+  {
+    for ( StateHistory::iterator it2 = it->begin(); it2 != it->end(); it2++ )
+    {
+      if ( (*it2)->data )
+      {
+        delete [] (*it2)->data;
+        (*it2)->data = NULL;
+      }
+      delete *it2;
+    }
+
+  }
+  
+  for ( UserStateHistory::iterator it = sentStates.begin(); it != sentStates.end(); it++ )
+  {
+    for ( StateHistory::iterator it2 = it->begin(); it2 != it->end(); it2++ )
+    {
+      if ( (*it2)->data )
+      {
+        delete [] (*it2)->data;
+        (*it2)->data = NULL;
+      }
+      delete *it2;
+    }
+
+  }
 }
 
@@ -134 +168 @@
         (*it2)->data = NULL;
       }
+      
+      delete *it2;
     }
     sentStates[userId].erase( sentStates[userId].begin(), it );
@@ -159 +195 @@
 
     stateFrom = initialEntry;
+    
+    sentStates[userId].push_back( stateFrom );
   }
   else
     stateFrom = (*it);
 
-  StateHistoryEntry * stateTo = new StateHistoryEntry();
-
+  StateHistoryEntry * stateTo = new StateHistoryEntry;
+
+  sentStates[userId].push_back( stateTo );
+  
   stateTo->stateId = stateId;
   stateTo->dataLength = neededSize;
@@ -175 +215 @@
   
   bool hasPermission;
+  bool sizeChanged = false;
 
   // now do the actual synchronization: kick all variables to write into a common buffer
@@ -186 +227 @@
                     );
     
-    if ( ( sizeIter != stateFrom->sizeList.end() && *sizeIter != (*it)->getSize() ) || ( hasPermission && (*it)->getPriority() >= priorityTH ) || sizeIter == stateFrom->sizeList.end() )
+    if ( sizeIter == stateFrom->sizeList.end() || *sizeIter != (*it)->getSize() ) 
+      sizeChanged = true;
+    
+    if ( ( hasPermission && (*it)->getPriority() >= priorityTH ) || sizeChanged )
     {
       n = (*it)->writeToBuf( stateTo->data+i, stateTo->dataLength - i );
@@ -210 +254 @@
   }
 
-  sentStates[userId].push_back( stateTo );
-  
   if ( i != neededSize )
   {
@@ -275 +317 @@
 
     stateFrom = initialEntry;
+    
+    recvStates[userId].push_back( stateFrom );
   }
   else
@@ -374 +418 @@
     {
       if ( (*it)->data )
+      {
         delete [] (*it)->data;
-      (*it)->data = NULL;
+        (*it)->data = NULL;
+      }
     
       delete *it;
@@ -388 +434 @@
     {
       if ( (*it)->data )
+      {
         delete [] (*it)->data;
-      (*it)->data = NULL;
+        (*it)->data = NULL;
+      }
     
       delete *it;
@@ -438 +486 @@
       
       if ( (*delIt)->data )
+      {
         delete [] (*delIt)->data;
+        (*delIt)->data = NULL;
+      }
+      delete *delIt;
       recvStates[userId].erase( delIt );
       
@@ -506 +558 @@
       
       if ( (*delIt)->data )
+      {
         delete [] (*delIt)->data;
+        (*delIt)->data = NULL;
+      }
+      delete *delIt;
       sentStates[userId].erase( delIt );