Changeset 9466 in orxonox.OLD for branches

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

Files:

• lib/network/player_stats.cc (modified) (1 diff)
• lib/network/synchronizeable.cc (modified) (1 diff)
• story_entities/multi_player_world_data.cc (modified) (4 diffs)
• world_entities/spawning_point.cc (modified) (2 diffs)

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() );

branches/proxy/src/story_entities/multi_player_world_data.cc

@@ -112 +112 @@
   const TiXmlElement* element = NULL;
 
-  if( SharedNetworkData::getInstance()->isMasterServer() || SharedNetworkData::getInstance()->isProxyServerActive())
+  if( SharedNetworkData::getInstance()->isMasterServer())
   {
     /* load the spawning points */
@@ -148 +148 @@
     element = element->FirstChildElement();
 
-    if( SharedNetworkData::getInstance()->isMasterServer() || SharedNetworkData::getInstance()->isProxyServerActive())
+    if( SharedNetworkData::getInstance()->isMasterServer() )
     {
       while( element != NULL)
@@ -206 +206 @@
 
 
-    if( SharedNetworkData::getInstance()->isMasterServer() || SharedNetworkData::getInstance()->isProxyServerActive())
+    if( SharedNetworkData::getInstance()->isMasterServer())
     {
       this->localPlayer = new Player();
@@ -284 +284 @@
 
   // create server playable
-  if ( SharedNetworkData::getInstance()->isMasterServer() || SharedNetworkData::getInstance()->isProxyServerActive())
+  if ( SharedNetworkData::getInstance()->isMasterServer())
   {
     NetworkGameManager::getInstance()->signalNewPlayer( 0 );

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");