[Orxonox-commit 180] r2855 - in trunk/src: orxonox/objects/worldentities util

[rgrieder at orxonox.net]

Author: rgrieder
Date: 2009-03-26 15:39:31 +0000 (Thu, 26 Mar 2009)
New Revision: 2855

Modified:
   trunk/src/orxonox/objects/worldentities/WorldEntity.cc
   trunk/src/util/CMakeLists.txt
Log:
Two small fixes.

Modified: trunk/src/orxonox/objects/worldentities/WorldEntity.cc
===================================================================
--- trunk/src/orxonox/objects/worldentities/WorldEntity.cc	2009-03-26 15:33:32 UTC (rev 2854)
+++ trunk/src/orxonox/objects/worldentities/WorldEntity.cc	2009-03-26 15:39:31 UTC (rev 2855)
@@ -659,6 +659,7 @@
             ogreRelativeTo = Ogre::Node::TS_PARENT; break;
         case TransformSpace::World:
             ogreRelativeTo = Ogre::Node::TS_WORLD; break;
+        default: OrxAssert(false, "Faulty TransformSpace::Enum assigned.");
         }
         this->node_->setDirection(direction, ogreRelativeTo, localDirectionVector);
         Quaternion newOrientation(this->node_->getOrientation());
@@ -758,7 +759,7 @@
         switch (type)
         {
         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:
             this->physicalBody_->setCollisionFlags(this->physicalBody_->getCollisionFlags() & !btCollisionObject::CF_STATIC_OBJECT | btCollisionObject::CF_KINEMATIC_OBJECT);

Modified: trunk/src/util/CMakeLists.txt
===================================================================
--- trunk/src/util/CMakeLists.txt	2009-03-26 15:33:32 UTC (rev 2854)
+++ trunk/src/util/CMakeLists.txt	2009-03-26 15:39:31 UTC (rev 2855)
@@ -28,6 +28,7 @@
   MathConvert.h
   MultiType.h
   MultiTypeValue.h
+  OrxEnum.h
   OutputBuffer.h
   OutputHandler.h
   SignalHandler.h