Changeset 8579 for code/branches/presentation/src/orxonox/items

Timestamp:

May 25, 2011, 9:28:29 PM (14 years ago)

Author:

dafrick

Message:

Reverse merge to revert last, failed, merge. Apparently you can't partially commit a merge.

File:

• code/branches/presentation/src/orxonox/items/Engine.cc (modified) (1 diff)

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

@@ -204 +204 @@
         this->ship_->setAcceleration(this->ship_->getOrientation() * (acceleration*this->getSpeedMultiply()+Vector3(0,0,-this->getSpeedAdd())));
 
+        if (!this->ship_->getPermanentBoost())
+            this->ship_->setBoost(false);
         this->ship_->setSteeringDirection(Vector3::ZERO);