Changeset 5844 in orxonox.OLD for branches/spaceshipcontrol/src/lib

Timestamp:

Nov 30, 2005, 10:18:43 PM (18 years ago)

Author:

bensch

Message:

orxonox/branches/spaceshipcontroll: rearanged ClassList classes

Location:

branches/spaceshipcontrol/src/lib

Files:

• lang/base_object.cc (modified) (1 diff)
• sound/sound_engine.cc (modified) (1 diff)

branches/spaceshipcontrol/src/lib/lang/base_object.cc

@@ -112 +112 @@
   else if (classID & CL_MASK_SUBSUPER_CLASS)
   {
-    if (likely(((this->classID & CL_MASK_SUBSUPER_CLASS_ID) == (this->classID & CL_MASK_SUBSUPER_CLASS_ID)) &&
-        this->classID & classID & CL_MASK_SUBSUPER_CLASS_ID2))
+    if (likely(((this->classID & CL_MASK_SUBSUPER_CLASS_IDA) == (this->classID & CL_MASK_SUBSUPER_CLASS_IDA)) &&
+        this->classID & classID & CL_MASK_SUBSUPER_CLASS_IDB))
       return true;
   }

branches/spaceshipcontrol/src/lib/sound/sound_engine.cc

@@ -281 +281 @@
 
   // INITIALIZING THE DEVICE:
-  ALchar deviceName[] =
+  ALubyte deviceName[] =
 #ifdef __WIN32__
       "native";