Changeset 8097 in orxonox.OLD

Timestamp:

Jun 1, 2006, 6:39:46 PM (18 years ago)

Author:

rennerc

Message:

teamchoice works now

Location:

branches/network/src/lib/network

Files:

• network_game_manager.cc (modified) (1 diff)
• player_stats.cc (modified) (1 diff)

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

@@ -160 +160 @@
     if ( dynamic_cast<Synchronizeable*>(*it)->getUniqueID() == uniqueId )
     {
+      if ( (*it)->isA(CL_PLAYABLE) )
+        return true;
+        
       delete dynamic_cast<Synchronizeable*>(*it);
       return true;

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

@@ -137 +137 @@
   }
   
-  if ( /*this->playable &&*/ userId == getHostID() )
+  if ( this->playable && userId == getHostID() )
     State::getPlayer()->setPlayable( this->playable );