Changeset 5651 in orxonox.OLD for trunk/src/story_entities/campaign.cc

Timestamp:

Nov 20, 2005, 5:14:27 PM (18 years ago)

Author:

bensch

Message:

orxonox/trunk: new (LoadParam && ExecutorSpecials)-Functionality that enables the Loading of XML-elements.
The new Executor really works out, and makes the understanding of loadParam way easier (given you won't read Executor

File:

• trunk/src/story_entities/campaign.cc (modified) (3 diffs)

trunk/src/story_entities/campaign.cc

@@ -28 +28 @@
 
 #include "load_param.h"
+
 
 using namespace std;
@@ -74 +75 @@
   static_cast<BaseObject*>(this)->loadParams(root);
 
-  LoadParam<Campaign>(root, "identifier", this, &Campaign::setStoryID)
-      .describe("A Unique Identifier for this Campaign");
-
-  LoadParam<Campaign>(root, "WorldList", this, &Campaign::loadWorldListParams)
+  //LoadParam<Campaign>(root, "identifier", this, &Campaign::setStoryID)
+  LoadParamNEW(root, "identifier", this, Campaign, setStoryID)
+     .describe("A Unique Identifier for this Campaign");
+
+//  LoadParam<Campaign>(root, "WorldList", this, &Campaign::loadWorldListParams)
+   LoadParamXML(root, "WorldList", this, Campaign, loadWorldListParams)
       .describe("A List of Worlds to be loaded in this Campaign");
 }
@@ -87 +90 @@
 void Campaign::loadWorldListParams(const TiXmlElement* root)
 {
+  if (root == NULL)
+    return;
+
   const TiXmlElement* element = root->FirstChildElement();
   // load Worlds/Subcampaigns/Whatever