Changeset 6405 for code/branches/pickup2/src/orxonox/items/Engine.cc

Timestamp:

Dec 23, 2009, 8:27:17 PM (14 years ago)

Author:

dafrick

Message:

Commit changes in pickup before merge.

File:

• code/branches/pickup2/src/orxonox/items/Engine.cc (modified) (2 diffs)

code/branches/pickup2/src/orxonox/items/Engine.cc

@@ -35 +35 @@
 #include "Scene.h"
 #include "worldentities/pawns/SpaceShip.h"
-#include "pickup/ModifierType.h"
+//TODO: Remove.
+//#include "pickup/ModifierType.h"
 #include "tools/Shader.h"
 
@@ -193 +194 @@
         }
 
-        this->ship_->setAcceleration(this->ship_->getPickups().processModifiers(ModifierType::Acceleration, this->ship_->getOrientation() * acceleration, false));
+        //TODO: Remove.
+        //this->ship_->setAcceleration(this->ship_->getPickups().processModifiers(ModifierType::Acceleration, this->ship_->getOrientation() * acceleration, false));
 
         if (!this->ship_->getPermanentBoost())