Changeset 9594 in orxonox.OLD

Timestamp:

Jul 29, 2006, 12:23:00 AM (18 years ago)

Author:

patrick

Message:

the team id is set correctly again at least for locals

Location:

branches/proxy/src

Files:

• lib/network/synchronizeable.cc (modified) (2 diffs)
• util/multiplayer_team_deathmatch.cc (modified) (1 diff)

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

@@ -411 +411 @@
 
     //  *              <====|  PROXY_SERVER
-    else if( this->networkStream->isUserProxyServerActive( userId )  && (*it)->checkPermission( PERMISSION_MASTER_SERVER )
-             && SharedNetworkData::getInstance()->isClient())
-      hasPermission = true;
     else if( this->networkStream->isUserProxyServerActive( userId ) && this->owner != SharedNetworkData::getInstance()->getHostID()
              && (*it)->checkPermission( PERMISSION_OWNER ))
       hasPermission = true;
-
     //  CLIENT         <====|  PROXY_SERVER
     else if( this->networkStream->isUserProxyServerActive( userId ) && SharedNetworkData::getInstance()->isClient()
@@ -424 +420 @@
     else if( this->networkStream->isUserProxyServerActive( userId ) && SharedNetworkData::getInstance()->isClient()
              && this->owner != SharedNetworkData::getInstance()->getHostID() && (*it)->checkPermission( PERMISSION_MASTER_SERVER ))
+      hasPermission = true;
+    else if( this->networkStream->isUserProxyServerActive( userId )  && SharedNetworkData::getInstance()->isClient()
+             && (*it)->checkPermission( PERMISSION_MASTER_SERVER ))
       hasPermission = true;
     // MASTER_SERVER   <====|  PROXY_SERVER

branches/proxy/src/util/multiplayer_team_deathmatch.cc

@@ -527 +527 @@
   stats.setTeamId( stats.getPreferedTeamId() );
 
-//   playable.setTeam(stats.getPreferedTeamId());
+  playable.setTeam(stats.getPreferedTeamId());