Changeset 5143 in orxonox.OLD for trunk/src/util

Timestamp:

Aug 27, 2005, 12:32:41 AM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: minor cleanup

Location:

trunk/src/util

Files:

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

trunk/src/util/shell_command.cc

@@ -48 +48 @@
     paramCount = FUNCTOR_MAX_ARGUMENTS;
   this->paramCount = paramCount;
-  this->parameters = new ParameterType[paramCount];
+  this->parameters = new long[paramCount];
 
   for (unsigned int i = 0; i < paramCount; i++)
@@ -146 +146 @@
           commandBegin++;
         if (strncmp (commandBegin, elem->getName(), strlen(elem->getName())))
-            continue;
+          continue;
         objectPointer = ClassList::getList(elem->classID)->firstElement();
       }
       else
       {
+        while(*commandBegin == ' ')
+          commandBegin++;
+        tIterator<BaseObject>* iterBO = ClassList::getList(elem->classID)->getIterator();
+        BaseObject* enumBO = iterBO->firstElement();
+        {
+          if( !strncmp(commandBegin, enumBO->getName(), strlen(enumBO->getName())))
+          {
+            objectPointer = enumBO;
+            break;
+          }
+          enumBO = iterBO->nextElement();
+        }
+        delete iterBO;
 
+        if (objectPointer == NULL)
+          break;
+        commandBegin = commandBegin + strlen(objectPointer->getName());
+        while(*commandBegin == ' ')
+          commandBegin++;
       }
       const char* commandEnd = strchr(commandBegin, ' ');
       if (commandEnd == NULL)
-        commandEnd = executionString + strlen(executionString);
+        commandEnd = commandBegin + strlen(commandBegin);
 
       if (objectPointer != NULL)
+      {
         elem->executeCommand(objectPointer, commandEnd);
-      delete iterator;
-      return true;
+        delete iterator;
+        return true;
+      }
     }
     elem = iterator->nextElement();

trunk/src/util/shell_command.h

@@ -10 +10 @@
 
 #include "helper_functions.h"
+#include "functor_list.h"
 
 #include <stdarg.h>
@@ -15 +16 @@
 #define MAX_SHELL_COMMAND_SIZE
 
-#include "functor_list.h"
 
 
@@ -94 +94 @@
     void*                            functionPointer;     //!< The pointeer to the function of the Class (or static pointer if ClassID == CL_NULL )
     unsigned int                     paramCount;          //!< the count of parameters
-    ParameterType*                   parameters;          //!< Parameters
+    long*                            parameters;          //!< Parameters
     bool                             isSingleton;         //!< if the Class is Singleton @todo autocheck