Changeset 6139 in orxonox.OLD for trunk/src/orxonox.cc

Timestamp:

Dec 16, 2005, 6:45:32 PM (18 years ago)

Author:

patrick

Message:

trunk: merged branche network with trunk using command: svn merge -r5999:HEAD, conflicts resolved in favor of the trunk bla

File:

• trunk/src/orxonox.cc (modified) (2 diffs)

trunk/src/orxonox.cc

@@ -280 +280 @@
   if( this->serverName != NULL) // we are a client
     NetworkManager::getInstance()->establishConnection(this->serverName, port);
-  else if( this->port > 0)      // we are a server
+  else if( this->port > 0) {    // we are a server
     NetworkManager::getInstance()->createServer(port);
+  }
 
   return 0;
@@ -352 +353 @@
   this->gameLoader = GameLoader::getInstance();
 
-  if( this->port != -1 || this->serverName != NULL)
-    this->gameLoader->loadCampaign("worlds/DefaultCampaign.oxc"); /* actualy loadNetworkCampaign*/
+  if( this->port != -1)
+    this->gameLoader->loadNetworkCampaign("worlds/DefaultNetworkCampaign.oxc");
   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);