Changeset 2855 for code/trunk

Timestamp:

Mar 26, 2009, 4:39:31 PM (16 years ago)

Author:

rgrieder

Message:

Two small fixes.

Location:

code/trunk/src

Files:

• orxonox/objects/worldentities/WorldEntity.cc (modified) (2 diffs)
• util/CMakeLists.txt (modified) (1 diff)

code/trunk/src/orxonox/objects/worldentities/WorldEntity.cc

@@ -660 +660 @@
         case TransformSpace::World:
             ogreRelativeTo = Ogre::Node::TS_WORLD; break;
+        default: OrxAssert(false, "Faulty TransformSpace::Enum assigned.");
         }
         this->node_->setDirection(direction, ogreRelativeTo, localDirectionVector);
@@ -759 +760 @@
         {
         case Dynamic:
-            this->physicalBody_->setCollisionFlags(this->physicalBody_->getCollisionFlags() & !(btCollisionObject::CF_STATIC_OBJECT | btCollisionObject::CF_KINEMATIC_OBJECT));
+            this->physicalBody_->setCollisionFlags(this->physicalBody_->getCollisionFlags() & !btCollisionObject::CF_STATIC_OBJECT & !btCollisionObject::CF_KINEMATIC_OBJECT);
             break;
         case Kinematic:

code/trunk/src/util/CMakeLists.txt

@@ -29 +29 @@
   MultiType.h
   MultiTypeValue.h
+  OrxEnum.h
   OutputBuffer.h
   OutputHandler.h