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

Timestamp:

Dec 12, 2005, 3:22:01 PM (18 years ago)

Author:

patrick

Message:

network: added extended game_loader interface

File:

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

branches/network/src/orxonox.cc

@@ -352 +352 @@
   this->gameLoader = GameLoader::getInstance();
 
-  if( this->port != -1 || this->serverName != NULL)
-    this->gameLoader->loadCampaign("worlds/DefaultCampaign.oxc"); /* actualy loadNetworkCampaign*/
+  if( this->serverName != NULL)
+    this->gameLoader->loadNetworkCampaign("worlds/DefaultCampaign.oxc", NET_CLIENT);    /* start as client */
+  else if( this->port != -1)
+    this->gameLoader->loadNetworkCampaign("worlds/DefaultCampaign.oxc", NET_SERVER);    /* start as server */
   else
-    this->gameLoader->loadCampaign("worlds/DefaultCampaign.oxc");
+    this->gameLoader->loadCampaign("worlds/DefaultCampaign.oxc");                       /* start orxonox in single player mode */
 
   //  this->gameLoader->loadDebugCampaign(DEBUG_CAMPAIGN_0);