Changeset 4501 in orxonox.OLD for orxonox/trunk/src/util/loading

Timestamp:

Jun 3, 2005, 11:59:34 AM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: loading of track works just fine now. little problems with the setSavePoint-function

Location:

orxonox/trunk/src/util/loading

Files:

• load_param.cc (modified) (1 diff)
• load_param.h (modified) (1 diff)

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

@@ -34 +34 @@
   this->loadString = NULL;
 
-  if (likely(!multi))
-    this->loadString = grabParameter(root, paramName);
+  if (paramCount == 0)
+    this->loadString = "none";
   else
     {
-      printf("paramName:::::%s\n", root->Value());
-      if (!strcmp(root->Value(), paramName))
-        {
-          const TiXmlNode* val = root->FirstChild();
-          if( val->ToText())
-            this->loadString = val->Value();
-        }
-    }
-  if (loadString)
-    printf("%s\n", loadString);
+      if (likely(!multi))
+        this->loadString = grabParameter(root, paramName);
+      else
+        {
+          if (!strcmp(root->Value(), paramName))
+            {
+              const TiXmlNode* val = root->FirstChild();
+              if( val->ToText())
+                this->loadString = val->Value();
+            }
+        }
+    }
 
   this->paramDesc = NULL;

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

@@ -247 +247 @@
 {
  public:
+  LoadParam(const TiXmlElement* root, const char* paramName, T* pt2Object, void(T::*function)(), bool multi = false)
+    : BaseLoadParam(root, pt2Object, paramName, 0, multi, "")
+    { 
+      if (loadString != NULL && root != NULL)
+        (*pt2Object.*function)(); 
+      else 
+        PRINTF(4)("Not loaded parameter %s of %s\n", paramName, pt2Object->getClassName());
+    }
+
+
   //! makes functions with one string loadable
   LoadParam1(l_STRING);