Changeset 8096 in orxonox.OLD for branches/network/src/lib/network/player_stats.cc

Timestamp:

Jun 1, 2006, 6:36:55 PM (18 years ago)

Author:

rennerc

Message:

teamchoice works now

File:

• branches/network/src/lib/network/player_stats.cc (modified) (4 diffs)

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

@@ -86 +86 @@
     
     PRINTF(0)("uniqueID changed %d %d\n", userId, getHostID());
-    
-    if ( userId == getHostID() )
-      State::getPlayer()->setPlayable( getPlayable() );
   }
 }
@@ -100 +97 @@
 {
   const std::list<BaseObject*> * list = ClassList::getList( CL_PLAYER_STATS );
+  
+  if ( !list )
+    return NULL;
   
   for ( std::list<BaseObject*>::const_iterator it = list->begin(); it != list->end(); it++ )
@@ -121 +121 @@
   const std::list<BaseObject*> * list = ClassList::getList( CL_PLAYABLE );
   
+  if ( !list )
+  {
+    this->playableUniqueId = uniqueId;
+    return;
+  }
+  
   this->playable = NULL;
   for ( std::list<BaseObject*>::const_iterator it = list->begin(); it != list->end(); it++ )
@@ -130 +136 @@
     }
   }
+  
+  if ( /*this->playable &&*/ userId == getHostID() )
+    State::getPlayer()->setPlayable( this->playable );
   
   this->playableUniqueId = uniqueId;