Changeset 3159 for code/branches/pch/src/orxonox

Timestamp:

Jun 13, 2009, 6:41:05 PM (15 years ago)

Author:

rgrieder

Message:

Several small fixes and some removed warnings

Location:

code/branches/pch/src/orxonox/objects/worldentities

Files:

• WorldEntity.cc (modified) (3 diffs)
• triggers/Trigger.cc (modified) (1 diff)

code/branches/pch/src/orxonox/objects/worldentities/WorldEntity.cc

@@ -633 +633 @@
     void WorldEntity::lookAt(const Vector3& target, TransformSpace::Enum relativeTo, const Vector3& localDirectionVector)
     {
-        Vector3 origin;
+        Vector3 origin(0, 0, 0);
         switch (relativeTo)
         {
@@ -660 +660 @@
     {
         Quaternion savedOrientation(this->getOrientation());
-        Ogre::Node::TransformSpace ogreRelativeTo;
+        Ogre::Node::TransformSpace ogreRelativeTo = Ogre::Node::TS_LOCAL;
         switch (relativeTo)
         {
@@ -772 +772 @@
             break;
         case Kinematic:
-            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 Static:
-            this->physicalBody_->setCollisionFlags(this->physicalBody_->getCollisionFlags() & !btCollisionObject::CF_KINEMATIC_OBJECT | btCollisionObject::CF_STATIC_OBJECT);
+            this->physicalBody_->setCollisionFlags((this->physicalBody_->getCollisionFlags() & !btCollisionObject::CF_KINEMATIC_OBJECT) | btCollisionObject::CF_STATIC_OBJECT);
             break;
         case None:

code/branches/pch/src/orxonox/objects/worldentities/triggers/Trigger.cc

@@ -237 +237 @@
   {
     if (( (this->latestState_ & 2) && this->bStayActive_ && (this->remainingActivations_ <= 0))
-     || (!(this->latestState_ & 2))                      && (this->remainingActivations_ == 0))
+     || (!(this->latestState_ & 2)                       && (this->remainingActivations_ == 0)))
       return false;
     else