Changeset 5144 in orxonox.OLD

Timestamp:

Aug 27, 2005, 12:56:47 AM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: now it is also possible, to execute Functions on NON-singleton classes

Location:

trunk/src

Files:

• util/shell_command.cc (modified) (3 diffs)
• world_entities/player.cc (modified) (1 diff)

trunk/src/util/shell_command.cc

@@ -146 +146 @@
           commandBegin++;
         if (strncmp (commandBegin, elem->getName(), strlen(elem->getName())))
+        {
+          elem = iterator->nextElement();
           continue;
+        }
+        // getting singleton-reference
         objectPointer = ClassList::getList(elem->classID)->firstElement();
       }
       else
       {
+        // checking for the Object
         while(*commandBegin == ' ')
           commandBegin++;
         tIterator<BaseObject>* iterBO = ClassList::getList(elem->classID)->getIterator();
         BaseObject* enumBO = iterBO->firstElement();
+        while(enumBO != NULL)
         {
-          if( !strncmp(commandBegin, enumBO->getName(), strlen(enumBO->getName())))
+          if(!strncmp(commandBegin, enumBO->getName(), strlen(enumBO->getName())))
           {
+            PRINTF(4)("Object %s matches\n", enumBO->getName());
             objectPointer = enumBO;
             break;
@@ -165 +172 @@
         delete iterBO;
 
+        // break on no object Found. We cannot operate on Classes, but on Objects
         if (objectPointer == NULL)
           break;
@@ -170 +178 @@
         while(*commandBegin == ' ')
           commandBegin++;
+        // checking for the requested function.
+        if (strncmp (commandBegin, elem->getName(), strlen(elem->getName())))
+        {
+          elem = iterator->nextElement();
+          continue;
+        }
+        PRINTF(3)("Function '%s' found\n", commandBegin);
       }
-      const char* commandEnd = strchr(commandBegin, ' ');
-      if (commandEnd == NULL)
-        commandEnd = commandBegin + strlen(commandBegin);
+      const char* paramBegin = strchr(commandBegin, ' ');
+      if (paramBegin == NULL)
+        paramBegin = commandBegin + strlen(elem->getName());
 
       if (objectPointer != NULL)
       {
-        elem->executeCommand(objectPointer, commandEnd);
+        elem->executeCommand(objectPointer, paramBegin);
         delete iterator;
         return true;

trunk/src/world_entities/player.cc

@@ -140 +140 @@
 //  this->setRelDir(Quaternion(M_PI, Vector(1,0,0)));
   this->setClassID(CL_PLAYER, "Player");
+
+  PRINTF(1)("PLAYER INIT\n");
   travelSpeed = 15.0;
   velocity = new Vector();