Changeset 2917 for code/branches/pickups2/src/orxonox/objects/items

Timestamp:

Apr 15, 2009, 5:03:58 PM (16 years ago)

Author:

landauf

Message:

merged pickup into pickup2

Location:

code/branches/pickups2

Files:

• . (modified) (2 props)
• src/orxonox/objects/items/Engine.cc (modified) (1 diff)

code/branches/pickups2/src/orxonox/objects/items/Engine.cc

@@ -192 +192 @@
         }
 
-        this->ship_->setAcceleration(this->ship_->getOrientation() * acceleration);
+        this->ship_->setAcceleration(this->ship_->getPickups().processModifiers(ModifierType::Acceleration, this->ship_->getOrientation() * acceleration, false));
 
         if (!this->ship_->getPermanentBoost())