Changeset 8228 in orxonox.OLD for trunk/src/lib/network/network_game_manager.cc

Timestamp:

Jun 8, 2006, 11:19:08 AM (18 years ago)

Author:

patrick

Message:

trunk: merged the network branche back to trunk with command: svn merge branches/network trunk -r8150:HEAD

File:

• trunk/src/lib/network/network_game_manager.cc (modified) (5 diffs)

trunk/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;
     }
   }
+  
+  return true;
 }
 
@@ -210 +220 @@
   
   NetworkGameManager::getInstance()->setPreferedTeam( userId, teamId );
+  
+  return true;
 }
 
@@ -220 +232 @@
   
   stats.setPreferedTeamId( teamId );
-  
 }