Changeset 4301 in orxonox.OLD for orxonox/branches/physics/src/util/loading/load_param.cc

Timestamp:

May 26, 2005, 3:20:55 PM (19 years ago)

Author:

bensch

Message:

orxonox/branches/physics: merged the trunk back to the physics-branche
merged with command:
svn merge -4 4283:HEAD ../../trunk/ .
no conflicts

File:

• orxonox/branches/physics/src/util/loading/load_param.cc (modified) (3 diffs)

orxonox/branches/physics/src/util/loading/load_param.cc

@@ -10 +10 @@
 
    ### File Specific:
-   main-programmer: Christian Meyer
+   main-programmer: Benjamin Grauer
    co-programmer: ...
 */
@@ -27 +27 @@
    \param ... the parameter information
 */
-BaseLoadParam::BaseLoadParam(BaseObject* object, const char* paramName, int paramCount, ...)
-{
+BaseLoadParam::BaseLoadParam(const TiXmlElement* root, BaseObject* object, const char* paramName, int paramCount, ...)
+{
+  this->loadString = grabParameter(root, paramName);
+
   this->paramDesc = NULL;
   if (LoadClassDescription::parametersDescription)
@@ -47 +49 @@
           strcpy(this->paramDesc->types[i], tmpTypeName);
         }
-      va_end(types);  
+      va_end(types);
 
       int argCount = 0;