Changeset 5163 in orxonox.OLD

Timestamp:

Sep 5, 2005, 10:37:45 PM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: match on Singleton dynamically

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

@@ -35 +35 @@
 //  this->classID = classID;
   this->className = className; //ClassList::IDToString(classID);
-
-/*  if (classID & CL_MASK_SINGLETON == CL_MASK_SINGLETON)
-    this->isSingleton = true;
-  else*/
-    this->isSingleton = true;
 
   // handling parameters, and storing them:
@@ -149 +144 @@
       PRINTF(4)("Class %s matches\n", elem->className);
       BaseObject* objectPointer = NULL;
-      if (elem->isSingleton)
+      if (ClassList::StringToID(elem->className) & CL_MASK_SINGLETON == CL_MASK_SINGLETON)
       {
         while(*commandBegin == ' ')

trunk/src/lib/shell/shell_command.h

@@ -54 +54 @@
 
   protected:
-    void*                            functionPointer;     //!< The pointeer to the function of the Class (or static pointer if ClassID == CL_NULL )
-    unsigned int                     paramCount;          //!< the count of parameters
-    unsigned int*                    parameters;          //!< Parameters
-    bool                             isSingleton;         //!< if the Class is Singleton @todo autocheck
+    void*                            functionPointer;                      //!< The pointeer to the function of the Class (or static pointer if ClassID == CL_NULL )
+    unsigned int                     paramCount;                           //!< the count of parameters
+    unsigned int*                    parameters;                           //!< Parameters
     char*                            defaultStrings[FUNCTOR_MAX_ARGUMENTS];
     int                              defaultInts[FUNCTOR_MAX_ARGUMENTS];
@@ -65 +64 @@
   private:
 //    long                             classID;             //!< The ID of the Class associated to this Command
-    const char*                      className;           //!< The Name of the Class associated to this Command
+    const char*                      className;                            //!< The Name of the Class associated to this Command
 
     // STATIC MEMBERS
-    static tList<ShellCommandBase>*  commandList;         //!< A list of availiable commands.
+    static tList<ShellCommandBase>*  commandList;                          //!< A list of availiable commands.
 };