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

Timestamp:

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

Author:

patrick

Message:

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

Location:

branches/network/src

Files:

• orxonox.cc (modified) (1 diff)
• util/loading/game_loader.cc (modified) (2 diffs)
• util/loading/game_loader.h (modified) (2 diffs)

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();

branches/network/src/util/loading/game_loader.cc

@@ -143 +143 @@
  * this will interprete the map/campaign files and recursivly load a tree of worlds/campaigns
  */
-ErrorMessage GameLoader::loadNetworkCampaign(const char* name)
-{}
+ErrorMessage GameLoader::loadNetworkCampaign(const char* fileName)
+{
+  ErrorMessage errorCode;
+  char* campaignName = ResourceManager::getFullName(fileName);
+  if( campaignName)
+  {
+    this->currentCampaign = this->fileToNetworkCampaign(campaignName);
+    delete[] campaignName;
+  }
+}
 
 
@@ -303 +311 @@
 
 /**
+ *  reads a campaign definition file into a campaign class
+ * @param fileName to be loaded
+ * @returns the loaded campaign
+ *
+ * this will interprete the map/campaign files and recursivly load a tree of worlds/campaigns
+ */
+Campaign* GameLoader::fileToNetworkCampaign(const char* fileName)
+{
+  /* do not entirely load the campaign. just the current world
+  before start of each world, it has to be initialized so it
+  can load everything it needs into memory then.
+  */
+
+  if( fileName == NULL)
+  {
+    PRINTF(2)("No filename specified for loading");
+    return NULL;
+  }
+
+  TiXmlDocument* XMLDoc = new TiXmlDocument( fileName);
+  // load the campaign document
+  if( !XMLDoc->LoadFile())
+  {
+    // report an error
+    PRINTF(1)("Could not load XML File %s: %s @ %d:%d\n", fileName, XMLDoc->ErrorDesc(), XMLDoc->ErrorRow(), XMLDoc->ErrorCol());
+    delete XMLDoc;
+    return NULL;
+  }
+
+  // check basic validity
+  TiXmlElement* root = XMLDoc->RootElement();
+  assert( root != NULL);
+
+  if( strcmp( root->Value(), "Campaign"))
+  {
+    // report an error
+    PRINTF(2)("Specified XML File is not an orxonox campaign file (Campaign element missing)\n");
+    delete XMLDoc;
+    return NULL;
+  }
+
+  // construct campaign
+  Campaign* c = new Campaign( root);
+
+  // free the XML data
+  delete XMLDoc;
+
+  return c;
+}
+
+
+/**
  *  handle keyboard commands
  * @param event the event to handle

branches/network/src/util/loading/game_loader.h

@@ -58 +58 @@
 
   ErrorMessage loadDebugCampaign(Uint32 campaignID);
-  ErrorMessage loadCampaign(const char* name);
-  ErrorMessage loadNetworkCampaign(const char* name);
+  ErrorMessage loadCampaign(const char* fileName);
+  ErrorMessage loadNetworkCampaign(const char* fileName);
 
   void process(const Event &event);
@@ -70 +70 @@
   GameLoader ();
 
-  Campaign* fileToCampaign(const char* name);
+  Campaign* fileToCampaign(const char* fileName);
+  Campaign* fileToNetworkCampaign(const char* fileName);