Changeset 8153 in orxonox.OLD

Timestamp:

Jun 5, 2006, 3:25:05 PM (18 years ago)

Author:

rennerc

Message:

removed nasty bug

Location:

branches/network/src/lib/network

Files:

• network_game_manager.cc (modified) (3 diffs)
• network_stream.cc (modified) (3 diffs)
• player_stats.cc (modified) (5 diffs)
• synchronizeable.cc (modified) (1 diff)

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

@@ -112 +112 @@
   stats->setPlayableUniqueId( playable.getUniqueID() );
   stats->setModelFileName( playableModel );
+  
+  return true;
 }
 
@@ -122 +124 @@
 bool NetworkGameManager::signalLeftPlayer(int userID)
 {
-  delete PlayerStats::getStats( userID )->getPlayable();
-  delete PlayerStats::getStats( userID );
+  if ( PlayerStats::getStats( userID ) )
+  {
+    if ( PlayerStats::getStats( userID )->getPlayable() )
+      delete PlayerStats::getStats( userID )->getPlayable();
+    delete PlayerStats::getStats( userID );
+  }
+  
+  return true;
 }
 
@@ -165 +173 @@
         return true;
       }
-        
+      
       delete dynamic_cast<Synchronizeable*>(*it);
       return true;

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

@@ -651 +651 @@
           }
         }
+        
 
         int n = sync->setStateDiff( peer->second.userId, buf+offset, syncDataLength, state, fromState ); 
@@ -664 +665 @@
       }
       
-      //TODO REMOVE THIS
-      int saveOffset = offset;
       
       for ( SynchronizeableList::iterator it = synchronizeables.begin(); it != synchronizeables.end(); it++ )
@@ -682 +681 @@
       assert( peer->second.lastRecvedState < state );
       peer->second.lastRecvedState = state;
-      
-      assert( saveOffset == offset );
-      
+
     }
   

branches/network/src/lib/network/player_stats.cc

@@ -21 +21 @@
 #include "player.h"
 #include "state.h"
+#include "shared_network_data.h"
 
 
@@ -85 +86 @@
     this->setPlayableUniqueId( this->playableUniqueId );
     
-    PRINTF(0)("uniqueID changed %d %d\n", userId, getHostID());
+    PRINTF(0)("uniqueID changed %d %d %d\n", userId, getHostID(), getUniqueID());
   }
 }
@@ -99 +100 @@
   
   if ( !list )
+  {
     return NULL;
+  }
   
   for ( std::list<BaseObject*>::const_iterator it = list->begin(); it != list->end(); it++ )
@@ -108 +111 @@
     }
   }
-  
-  //TODO maybe we should create an object here
   
   return NULL;
@@ -138 +139 @@
   
   if ( this->playable && userId == getHostID() )
+  {
     State::getPlayer()->setPlayable( this->playable );
+  }
   
   this->playableUniqueId = uniqueId;

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

@@ -369 +369 @@
 void Synchronizeable::cleanUpUser( int userId )
 {
-  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;
-    }
-  }
-  
-  sentStates.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;
-    }
-  }
-  
-  recvStates.clear();
+  if ( recvStates.size() > userId )
+  {
+    for ( std::list<StateHistoryEntry*>::iterator it = recvStates[userId].begin(); it != recvStates[userId].end(); it++ )
+    {
+      if ( (*it)->data )
+        delete [] (*it)->data;
+      (*it)->data = NULL;
+    
+      delete *it;
+    }
+    recvStates[userId].clear();
+  }
+ 
+  if ( sentStates.size() > userId )
+  {
+    
+    for ( std::list<StateHistoryEntry*>::iterator it = sentStates[userId].begin(); it != sentStates[userId].end(); it++ )
+    {
+      if ( (*it)->data )
+        delete [] (*it)->data;
+      (*it)->data = NULL;
+    
+      delete *it;
+    }
+    sentStates[userId].clear();
+  }
 }