Changeset 5640 in orxonox.OLD

Timestamp:

Nov 18, 2005, 7:29:10 PM (18 years ago)

Author:

bensch

Message:

orxonox/trunk: default Values work, and small fix with unused ShellCommand_Type

Location:

trunk/src/lib/shell

Files:

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

trunk/src/lib/shell/shell_command.cc

@@ -264 +264 @@
           if (!strcmp(enumCMD->getName(), inputSplits.getString(fktPos)))
           {
-            if (objectPointer == NULL && enumCMD->functorType == ShellCommand_Objective)
+            if (objectPointer == NULL && enumCMD->executor->getType() == Executor_Objective)
             {
               delete itCMD;
@@ -339 +339 @@
   if (this == NULL)
     return NULL;
-  if (count == 0)
-    return this;
-  if (count > this->paramCount)
-    count = this->paramCount;
-
-  va_list defaultList;
-  va_start(defaultList, count);
-
-  for (unsigned int i = 0; i < count; i++)
-  {
-
-
-    switch (this->parameters[i])
-    {
-      case MT_BOOL:
-        this->defaultValue[i].setInt(va_arg(defaultList, int));
-        break;
-      case MT_CHAR:
-        this->defaultValue[i].setChar((char)va_arg(defaultList, int));
-        break;
-      case MT_STRING:
-        this->defaultValue[i].setString(va_arg(defaultList, char*));
-        break;
-      case MT_INT:
-        this->defaultValue[i].setInt(va_arg(defaultList, int));
-        break;
-/*      case MT_UINT:
-        this->defaultValue[i].setInt((int)va_arg(defaultList, unsigned int));
-        break;*/
-      case MT_FLOAT:
-        this->defaultValue[i].setFloat(va_arg(defaultList, double));
-        break;
-/*      case MT_LONG:
-        this->defaultValue[i].setInt((int) va_arg(defaultList, long));
-        break;*/
-      default:
-        break;
-    }
-  }
+
+  va_list values;
+  va_start(values, count);
+
+  this->executor->defaultValues(count, values);
+
   return this;
 }

trunk/src/lib/shell/shell_command.h

@@ -60 +60 @@
 
 
-//! an enumerator for the definition of the Type.
-typedef enum {
-  ShellCommand_Objective = 1,
-  ShellCommand_Static    = 2,
-} ShellCommand_Type;
 
 //! a baseClass for all possible ShellCommands
@@ -87 +82 @@
     ~ShellCommand();
 
-    /** @returns the Type of this Function (either static or objective) */
-    inline ShellCommand_Type getType() { return this->functorType; };
-
     static bool isRegistered(const char* commandName, const char* className, Executor* executor);
     static const char* paramToString(long parameter);
 
   protected:
-    ShellCommand_Type                functorType;                          //!< The type of Function we've got (either static or objective).
     void*                            functionPointer;                      //!< The pointeer to the function of the Class (or static pointer if ClassID == CL_NULL )
     unsigned int                     paramCount;                           //!< the count of parameters.