Changeset 4598 in orxonox.OLD for orxonox/trunk/src/util/loading/load_param.cc

Timestamp:

Jun 11, 2005, 3:08:36 AM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: campaign now gets loaded via LoadParam

File:

• orxonox/trunk/src/util/loading/load_param.cc (modified) (2 diffs)

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

@@ -30 +30 @@
 */
 BaseLoadParam::BaseLoadParam(const TiXmlElement* root, BaseObject* object, const char* paramName,
-                             int paramCount, bool multi, ...)
+                             int paramCount, bool multi, const void* pointerToParam, ...)
 {
   this->setClassID(CL_LOAD_PARAM, "LoadParam");
   this->loadString = NULL;
-
-  if (paramCount == 0)
+  this->pointerToParam = pointerToParam;
+
+  if (paramCount == 0 || this->pointerToParam)
     this->loadString = "none";
   else
@@ -63 +64 @@
 
       va_list types;
-      va_start (types, multi);
+      va_start (types, pointerToParam);
       for(int i = 0; i < paramCount; i++)
         {