Changeset 5979 in orxonox.OLD for branches/network/src/orxonox.cc

Timestamp:

Dec 7, 2005, 5:58:01 PM (18 years ago)

Author:

patrick

Message:

network: now the game-loader is prepeared for network play

File:

• branches/network/src/orxonox.cc (modified) (1 diff)

branches/network/src/orxonox.cc

@@ -351 +351 @@
 
   this->gameLoader = GameLoader::getInstance();
-  
-  if( this->port == -1 || this->serverName != NULL)
-    this->gameLoader->loadNetworkCampaign("worlds/DefaultNetworkCampaign.oxc");
+
+  if( this->port != -1 || this->serverName != NULL)
+    this->gameLoader->loadNetworkCampaign("worlds/DefaultCampaign.oxc");
   else
     this->gameLoader->loadCampaign("worlds/DefaultCampaign.oxc");
-  
+
   //  this->gameLoader->loadDebugCampaign(DEBUG_CAMPAIGN_0);
   this->gameLoader->init();