Changeset 9593 in orxonox.OLD

Timestamp:

Jul 29, 2006, 12:15:03 AM (18 years ago)

Author:

patrick

Message:

new system works good, some finetuning now

File:

• branches/proxy/src/lib/network/synchronizeable.cc (modified) (1 diff)

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

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