Changeset 9466 in orxonox.OLD for branches/proxy/src/lib

Timestamp:

Jul 25, 2006, 8:30:40 PM (18 years ago)

Author:

patrick

Message:

testing around with permissions: proxy should be able to handle a handshake and its local client and not more

Location:

branches/proxy/src/lib/network

Files:

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

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

@@ -191 +191 @@
 void PlayerStats::setNickName( std::string nick )
 {
-  if ( SharedNetworkData::getInstance()->isMasterServer() || SharedNetworkData::getInstance()->isProxyServerActive() )
+  if ( SharedNetworkData::getInstance()->isMasterServer() /*|| SharedNetworkData::getInstance()->isProxyServerActive()*/ )
   {
     this->nickName = nick;

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

@@ -72 +72 @@
     this->networkStream->disconnectSynchronizeable(*this);
 
-    if ( (SharedNetworkData::getInstance()->isMasterServer() || SharedNetworkData::getInstance()->isProxyServerActive() )
+    if ( (SharedNetworkData::getInstance()->isMasterServer() /*|| SharedNetworkData::getInstance()->isProxyServerActive()*/ )
            && this->beSynchronized() && this->getUniqueID() > 0 && !this->isA( CL_MESSAGE_MANAGER ) )
       NetworkGameManager::getInstance()->removeSynchronizeable( this->getUniqueID() );