Changeset 5633 in orxonox.OLD for trunk/src/lib/util/executor/executor.cc

Timestamp:

Nov 18, 2005, 6:08:36 PM (18 years ago)

Author:

bensch

Message:

orxonox/trunk: Executor works just fine.
Changed: Paramerte* to MT_*, to make things more general

File:

• trunk/src/lib/util/executor/executor.cc (modified) (4 diffs)

trunk/src/lib/util/executor/executor.cc

@@ -47 +47 @@
   if (paramCount > FUNCTOR_MAX_ARGUMENTS)
     paramCount = FUNCTOR_MAX_ARGUMENTS;
+  // reading in Parameters.
   this->paramCount = paramCount;
-  this->parameters = new unsigned int[paramCount];
   this->defaultValue = new MultiType[paramCount];
 
@@ -56 +56 @@
   // What Parameters we have got
   for (unsigned int i = 0; i < paramCount; i++)
-    this->parameters[i] = va_arg(parameterList, int);
+    this->defaultValue[i].setType(va_arg(parameterList, int));
 }
 
@@ -64 +64 @@
 Executor::~Executor()
 {
-  delete[] this->parameters;
   delete[] this->defaultValue;
 }
@@ -106 +105 @@
   for (unsigned int i = 0; i < count; i++)
   {
-
-
-    switch (this->parameters[i])
+    switch (this->defaultValue[i].getType())
     {
-      case ParameterBool:
+      case MT_BOOL:
         this->defaultValue[i].setInt(va_arg(defaultList, int));
         break;
-      case ParameterChar:
+      case MT_CHAR:
         this->defaultValue[i].setChar((char)va_arg(defaultList, int));
         break;
-      case ParameterString:
+      case MT_STRING:
         this->defaultValue[i].setString(va_arg(defaultList, char*));
         break;
-      case ParameterInt:
+      case MT_INT:
         this->defaultValue[i].setInt(va_arg(defaultList, int));
         break;
-      case ParameterUInt:
+/*      case MT_UINT:
         this->defaultValue[i].setInt((int)va_arg(defaultList, unsigned int));
-        break;
-      case ParameterFloat:
+        break;*/
+      case MT_FLOAT:
         this->defaultValue[i].setFloat(va_arg(defaultList, double));
         break;
-      case ParameterLong:
+/*      case MT_LONG:
         this->defaultValue[i].setInt((int) va_arg(defaultList, long));
-        break;
+        break;*/
       default:
         break;