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

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

File:

• branches/proxy/src/world_entities/spawning_point.cc (modified) (2 diffs)

branches/proxy/src/world_entities/spawning_point.cc

@@ -178 +178 @@
       }
 
-      if ( found && SharedNetworkData::getInstance()->isMasterServer() || SharedNetworkData::getInstance()->isProxyServerActive())
+      if ( found && SharedNetworkData::getInstance()->isMasterServer() /*|| SharedNetworkData::getInstance()->isProxyServerActive()*/)
         this->sendRespawnMessage( it->entity->getUniqueID() );
 
@@ -218 +218 @@
 bool SpawningPoint::respawnMessageHandler( MessageId messageId, byte * data, int dataLength, void * someData, int userId )
 {
-  if ( SharedNetworkData::getInstance()->isMasterServer() || SharedNetworkData::getInstance()->isProxyServerActive())
+  if ( SharedNetworkData::getInstance()->isMasterServer() /*|| SharedNetworkData::getInstance()->isProxyServerActive()*/)
   {
     PRINTF(2)("server received spawn message!\n");