Changeset 2900 for code/branches/pickups/src/orxonox/objects/pickup/ModifierPickup.cc

Timestamp:

Apr 6, 2009, 3:53:50 PM (15 years ago)

Author:

danielh

Message:

• some changes to the base framework
• added DroppedItem
• implemented usable items and a test UsableItem (Jump), console command to use an item is "useItem"
• added ModifierType::Acceleration

Location:

code/branches/pickups

Files:

• . (modified) (1 prop)
• src/orxonox/objects/pickup/ModifierPickup.cc (modified) (2 diffs)

code/branches/pickups/src/orxonox/objects/pickup/ModifierPickup.cc

@@ -74 +74 @@
         XMLPortParamTemplate(ModifierPickup, "damageAdd", setAdditiveDamage, getAdditiveDamage, element, mode, float);
         XMLPortParamTemplate(ModifierPickup, "damageMulti", setMultiplicativeDamage, getMultiplicativeDamage, element, mode, float);
+
+        XMLPortParamTemplate(ModifierPickup, "accelerationAdd", setAdditiveAcceleration, getAdditiveAcceleration, element, mode, float);
+        XMLPortParamTemplate(ModifierPickup, "accelerationMulti", setMultiplicativeAcceleration, getMultiplicativeAcceleration, element, mode, float);
     }
     /**
@@ -141 +144 @@
                 this->timer_.stopTimer();
 
+            delete this;
+
             return true;
         }