Changeset 3073 for code/trunk/src/orxonox/objects/items

Timestamp:

May 25, 2009, 8:30:15 PM (16 years ago)

Author:

landauf

Message:

merged pickups2 branch back to trunk. not yet tested.

Location:

code/trunk

Files:

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

code/trunk

@@ -1 +1 @@
 build
 codeblocks
+dependencies

@@ -1 +1 @@
 build
 codeblocks
+dependencies

code/trunk/src/orxonox/objects/items/Engine.cc

@@ -200 +200 @@
         }
 
-        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())

@@ -1 +1 @@
 build
 codeblocks
+dependencies