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

Timestamp:

Dec 7, 2005, 4:59:24 PM (20 years ago)

Author:

patrick

Message:

network: started renice work on the game_load, making it network friendly:D

File:

• branches/network/src/orxonox.cc (modified) (4 diffs)

branches/network/src/orxonox.cc

@@ -83 +83 @@
 
   /* this way, there is no network enabled: */
-  this->clientName = NULL;
+  this->serverName = NULL;
   this->port = -1;
 
@@ -190 +190 @@
   this->argv = argv;
 
-  this->clientName = name;
+  this->serverName = name;
   this->port = port;
 
@@ -278 +278 @@
   PRINT(3)("> Initializing networking\n");
 
-  if( this->clientName != NULL) // we are a client
-    NetworkManager::getInstance()->establishConnection(this->clientName, port);
+  if( this->serverName != NULL) // we are a client
+    NetworkManager::getInstance()->establishConnection(this->serverName, port);
   else if( this->port > 0)      // we are a server
     NetworkManager::getInstance()->createServer(port);
@@ -351 +351 @@
 
   this->gameLoader = GameLoader::getInstance();
-  this->gameLoader->loadCampaign("worlds/DefaultCampaign.oxc");
+  
+  if( this->port == -1 || this->serverName != NULL)
+    this->gameLoader->loadNetworkCampaign("worlds/DefaultNetworkCampaign.oxc");
+  else
+    this->gameLoader->loadCampaign("worlds/DefaultCampaign.oxc");
+  
   //  this->gameLoader->loadDebugCampaign(DEBUG_CAMPAIGN_0);
   this->gameLoader->init();