Changeset 3280 for code/trunk/src/orxonox/objects/pickup/ModifierPickup.h
- Timestamp:
- Jul 12, 2009, 11:58:01 PM (15 years ago)
- Location:
- code/trunk
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
code/trunk
- Property svn:mergeinfo changed
/code/branches/core4 (added) merged: 3235-3237,3245-3250,3253-3254,3260-3261,3265,3270
- Property svn:mergeinfo changed
-
code/trunk/src/orxonox/objects/pickup/ModifierPickup.h
r3196 r3280 130 130 void timerCallback(Pawn* pawn); //!< Method called when the timer runs out. 131 131 private: 132 float getAdditiveModifier(ModifierType:: Enumtype) const; //!< Get the additive modifier for a given ModifierType.133 float getMultiplicativeModifier(ModifierType:: Enumtype) const; //!< Get the multiplicative modifier for a given ModifierType.134 void setAdditiveModifier(ModifierType:: Enumtype, float value); //!< Set the additive modifier for a given ModifierType.135 void setMultiplicativeModifier(ModifierType:: Enumtype, float value); //!< Set the multiplicative modifier for a given ModifierType132 float getAdditiveModifier(ModifierType::Value type) const; //!< Get the additive modifier for a given ModifierType. 133 float getMultiplicativeModifier(ModifierType::Value type) const; //!< Get the multiplicative modifier for a given ModifierType. 134 void setAdditiveModifier(ModifierType::Value type, float value); //!< Set the additive modifier for a given ModifierType. 135 void setMultiplicativeModifier(ModifierType::Value type, float value); //!< Set the multiplicative modifier for a given ModifierType 136 136 137 std::map<ModifierType:: Enum, float> additiveModifiers_; //!< Map of additive modifiers, indexed by ModifierType.138 std::map<ModifierType:: Enum, float> multiplicativeModifiers_; //!< Map of multiplicative modifiers, indexed by ModifierType.137 std::map<ModifierType::Value, float> additiveModifiers_; //!< Map of additive modifiers, indexed by ModifierType. 138 std::map<ModifierType::Value, float> multiplicativeModifiers_; //!< Map of multiplicative modifiers, indexed by ModifierType. 139 139 140 140 float duration_; //!< Duration of this pickup's effect (0 for unlimited).
Note: See TracChangeset
for help on using the changeset viewer.