Changeset 5146 in orxonox.OLD

Timestamp:

Aug 27, 2005, 2:34:18 AM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: calling to 1-param works (without any real parameters)

Location:

trunk/src/util

Files:

• shell_command.cc (modified) (4 diffs)
• shell_command.h (modified) (1 diff)

trunk/src/util/shell_command.cc

@@ -52 +52 @@
   for (unsigned int i = 0; i < paramCount; i++)
   {
-    parameters[i] = va_arg(parameters, long);
-
-    switch (parameters[i])
+    this->parameters[i] = va_arg(parameters, long);
+
+    switch (this->parameters[i])
     {
       case ParameterBool:
@@ -145 +145 @@
       const char* commandBegin = executionString + strlen(elem->className);
 
-      PRINTF(5)("Class %s matches\n", elem->className);
+      PRINTF(4)("Class %s matches\n", elem->className);
       BaseObject* objectPointer = NULL;
       if (elem->isSingleton)
@@ -175 +175 @@
           if(!strncmp(commandBegin, enumBO->getName(), strlen(enumBO->getName())))
           {
-            PRINTF(5)("Object %s matches\n", enumBO->getName());
+            PRINTF(4)("Object %s matches\n", enumBO->getName());
             objectPointer = enumBO;
             break;
@@ -201 +201 @@
         paramBegin = commandBegin + strlen(elem->getName());
 
-      if (objectPointer != NULL)
+      if (objectPointer != NULL && paramBegin != NULL)
       {
         elem->executeCommand(objectPointer, paramBegin);

trunk/src/util/shell_command.h

@@ -69 +69 @@
 
 #define ShellCommandExecute1(t1) \
-   else if (this->paramCount == 1 && this->parameters[0] & t1##_PARAM) \
+   else if (this->paramCount == 1 && this->parameters[0] == t1##_PARAM) \
        (dynamic_cast<T*>(object)->*functionPointer_1_##t1)(0)//t1##_FUNC(parameters, 0))