Changeset 9494 in orxonox.OLD for trunk/src/story_entities/multi_player_world_data.cc

Timestamp:

Jul 27, 2006, 10:44:28 AM (19 years ago)

Author:

bensch

Message:

merged the proxy back

File:

• trunk/src/story_entities/multi_player_world_data.cc (modified) (4 diffs)

trunk/src/story_entities/multi_player_world_data.cc

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