Changeset 5634 in orxonox.OLD for trunk/src/defs

Timestamp:

Nov 18, 2005, 6:09:01 PM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: Executor works just fine.
Changed: Paramerte* to MT_*, to make things more general

Location:

trunk/src/defs

Files:

• class_id.h (modified) (1 diff)
• functor_list.h (modified) (6 diffs)

trunk/src/defs/class_id.h

@@ -213 +213 @@
   CL_TRACK_ELEMENT              =    0x00000b0b,
   CL_NUMBER                     =    0x00000b0c,
+  CL_EXECUTOR                   =    0x00000b0d,
   CL_FAST_FACTORY               =    0x00000c01,
   CL_SHELL                      =    0x00000c10,

trunk/src/defs/functor_list.h

@@ -30 +30 @@
 //! defines the maximum count of arguments function pointers might have
 #define FUNCTOR_MAX_ARGUMENTS                5
-
-typedef enum
-{
-  ParameterNull    = 0,
-  ParameterBool    = 1,
-  ParameterChar    = 2,
-  ParameterString  = 4,
-  ParameterInt     = 8,
-  ParameterUInt    = 16,
-  ParameterFloat   = 32,
-  ParameterLong    = 64,
-  ParameterXML     = 128,
-  /* ... */
-} ParameterType;
-
+#include "multi_type.h"
 
 #define l_BOOL_TYPE        bool                 //!< The type of an BOOL
 #define l_BOOL_FUNC        isBool               //!< The function to call to parse BOOL
 #define l_BOOL_NAME        "bool"               //!< The name of an BOOL
-#define l_BOOL_PARAM       ParameterBool        //!< the type of the parameter BOOL
+#define l_BOOL_PARAM       MT_BOOL              //!< the type of the parameter BOOL
 #define l_BOOL_DEFAULT     false                //!< a default Value for an BOOL
 
@@ -56 +42 @@
 #define l_INT_FUNC         isInt                //!< The function to call to parse INT
 #define l_INT_NAME         "int"                //!< The name of an INT
-#define l_INT_PARAM        ParameterInt         //!< the type of the parameter INT
+#define l_INT_PARAM        MT_INT               //!< the type of the parameter INT
 #define l_INT_DEFAULT      0                    //!< a default Value for an INT
 
@@ -62 +48 @@
 #define l_UINT_FUNC        isInt                //!< The function to call to parse UINT
 #define l_UINT_NAME        "unsigned int"       //!< The name of an UINT
-#define l_UINT_PARAM        ParameterUInt       //!< the type of the parameter UINT
+#define l_UINT_PARAM       MT_INT        //!< the type of the parameter UINT
 #define l_UINT_DEFAULT     0                    //!< a default Value for an UINT
 
@@ -68 +54 @@
 #define l_LONG_FUNC        isInt                //!< The function to parse a LONG
 #define l_LONG_NAME        "long"               //!< The name of a LONG
-#define l_LONG_PARAM       ParameterLong        //!< the type of the parameter LONG
+#define l_LONG_PARAM       MT_INT //!< the type of the parameter LONG
 #define l_LONG_DEFAULT     0                    //!< a default Value for a LONG
 
@@ -80 +66 @@
 #define l_FLOAT_FUNC       isFloat              //!< The function to parse a FLOAT
 #define l_FLOAT_NAME       "float"              //!< The name of a FLOAT
-#define l_FLOAT_PARAM      ParameterFloat       //!< the type of the parameter FLOAT
+#define l_FLOAT_PARAM      MT_FLOAT             //!< the type of the parameter FLOAT
 #define l_FLOAT_DEFAULT    0.0                  //!< a default Value for a FLOAT
 
@@ -91 +77 @@
 #define l_STRING_FUNC      isString             //!< The function to parse a STRING
 #define l_STRING_NAME      "string"             //!< The name of a STRING
-#define l_STRING_PARAM     ParameterString      //!< the type of the parameter STRING
+#define l_STRING_PARAM     MT_STRING            //!< the type of the parameter STRING
 #define l_STRING_DEFAULT   ""                   //!< a default Value for an STRING