Changeset 9257 in orxonox.OLD for branches/proxy/src/story_entities

Timestamp:

Jul 12, 2006, 5:10:09 PM (18 years ago)

Author:

patrick

Message:

more framework switching

File:

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

branches/proxy/src/story_entities/multi_player_world_data.cc

@@ -110 +110 @@
 {
   const TiXmlElement* element = NULL;
-  
-  if( NetworkManager::getInstance()->isGameServer() )
+
+  if( NetworkManager::getInstance()->isMasterServer() )
   {
     /* load the spawning points */
@@ -147 +147 @@
     element = element->FirstChildElement();
 
-    if( NetworkManager::getInstance()->isGameServer() )
+    if( NetworkManager::getInstance()->isMasterServer() )
     {
       while( element != NULL)
@@ -205 +205 @@
 
 
-    if( NetworkManager::getInstance()->isGameServer())
+    if( NetworkManager::getInstance()->isMasterServer())
     {
       this->localPlayer = new Player();
@@ -281 +281 @@
 
   // create server playable
-  if ( NetworkManager::getInstance()->isGameServer() )
+  if ( NetworkManager::getInstance()->isMasterServer() )
   {
     NetworkGameManager::getInstance()->signalNewPlayer( 0 );