Changeset 4625 in orxonox.OLD for orxonox

Timestamp:

Jun 13, 2005, 8:48:27 PM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: default Values should work now even better

Location:

orxonox/trunk/src/util/loading

Files:

• load_param.cc (modified) (2 diffs)
• load_param.h (modified) (2 diffs)

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

@@ -56 +56 @@
   if (LoadClassDescription::parametersDescription)
   {
-      //! \todo this must only be done once for each class.
-      // locating the class
+    // locating the class
     this->classDesc = LoadClassDescription::addClass(object->getClassName());
 
@@ -222 +221 @@
       if (i > 0)
         PRINT(3)(", ");
-      PRINT(3)("%s", this->defaultValues[i]);
+      if (!strcmp(this->types[i], l_STRING_NAME))
+      { // leave brackets !!
+        PRINT(3)("\"%s\"", this->defaultValues[i]);
+      }
+      else
+      {
+        PRINT(3)("%s", this->defaultValues[i]);
+      }
     }
     PRINT(3)(")");

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

@@ -213 +213 @@
 // Pointer TYPE
 /**
-   \brief a Macro to easily implement many different Constructors for the LoadParam-Class with 1 argument
+   \brief a Macro to easily implement many different Constructors for the LoadParam-Class with one Pointer argument
    \param type1 The type of the Pointer
  */
@@ -346 +346 @@
 
   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")
+  : BaseLoadParam(root, pt2Object, paramName, 1, multi, NULL, "XML")
   {
     if (root != NULL)