Changeset 4599 in orxonox.OLD for orxonox/trunk

Timestamp:

Jun 11, 2005, 3:23:35 AM (20 years ago)

Author:

bensch

Message:

orxonox/trunk: loading of XML-elements is real smooth now

Location:

orxonox/trunk/src

Files:

• story_entities/campaign.cc (modified) (1 diff)
• util/loading/load_param.h (modified) (1 diff)

orxonox/trunk/src/story_entities/campaign.cc

@@ -76 +76 @@
   LoadParam<Campaign>(root, "identifier", this, &Campaign::setStoryID);
 
-  LoadParam<Campaign>(root, "WorldList", this, &Campaign::loadWorldListParams, root->FirstChildElement("WorldList"));
+  LoadParam<Campaign>(root, "WorldList", this, &Campaign::loadWorldListParams);
 }
 

orxonox/trunk/src/util/loading/load_param.h

@@ -306 +306 @@
   LoadParam4(l_FLOAT, l_FLOAT, l_FLOAT, l_FLOAT);
 
-  LoadParamPT(l_XML_ELEM);
+
+  LoadParam(const TiXmlElement* root, const char* paramName, T* pt2Object, void(T::*function)(const TiXmlElement*), bool multi = false)
+  : BaseLoadParam(root, pt2Object, paramName, 1, multi, NULL, "XML-Element")
+  {
+    if (root != NULL)
+    {
+      const TiXmlElement* elem = root->FirstChildElement(paramName);
+      if (likely(elem != NULL))
+        (*pt2Object.*function)(elem);
+      else
+        PRINTF(2)("%s of %s is empty", paramName, pt2Object->getClassName());
+    }
+    else
+      PRINTF(4)("Not loaded parameter %s of %s\n", paramName, pt2Object->getClassName());
+  }
+
+  //LoadParamPT(l_XML_ELEM);
 };