Changeset 4594 in orxonox.OLD

Timestamp:

Jun 10, 2005, 7:52:04 PM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: isA should work now

Location:

orxonox/trunk/src

Files:

• defs/class_list.h (modified) (2 diffs)
• lib/lang/base_object.cc (modified) (2 diffs)

orxonox/trunk/src/defs/class_list.h

@@ -46 +46 @@
 {
   // superclasses
-  CL_MASK_SUPERCLASS      =    0xff000000,
+  CL_MASK_SUPER_CLASS     =    0xff000000,
   CL_BASE_OBJECT          =    0x01000000,
 
@@ -59 +59 @@
 
   // subsuper-classes
-  CL_MASK_SUBCLASS        =    0x00fff000,
+  CL_MASK_SUBSUPER_CLASS  =    0x00fff000,
   CL_PLAYER               =    0x00001000,
   CL_NPC                  =    0x00002000,

orxonox/trunk/src/lib/lang/base_object.cc

@@ -115 +115 @@
 bool BaseObject::isA (ClassID classID)
 {
-  if( this->classID & classID)
-    return true;
+  // if classID is a derivable object
+  if (classID & CL_MASK_SUPER_CLASS || classID & CL_MASK_SUBSUPER_CLASS)
+  {
+    if( this->classID & classID)
+      return true;
+  }
+  // if classID is a LOWLEVEL-class
+  else
+  {
+    if ((this->classID & CL_MASK_LOWLEVEL_CLASS) == classID)
+      return true;
+  }
   return false;
 }
@@ -126 +136 @@
 {
   PRINT(0)("object %s: ", this->getName() );
-  if (this->classID & CL_MASK_SUPERCLASS)
+  if (this->classID & CL_MASK_SUPER_CLASS)
   {
     PRINT(0)("is a derived Class from: \n");