- Timestamp:
- May 18, 2012, 2:58:33 PM (12 years ago)
- Location:
- code/branches/presentation2012
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
code/branches/presentation2012
- Property svn:mergeinfo changed
/code/branches/pickup2012 (added) merged: 9029,9099,9118-9119,9155,9184
- Property svn:mergeinfo changed
-
code/branches/presentation2012/src/orxonox/worldentities/pawns/Pawn.h
r9016 r9195 162 162 { return this->numexplosionchunks_; } 163 163 164 // These are used with the Damage Boost Pickup to use the damage multiplier. 165 inline void setDamageMultiplier(float multiplier) 166 { this->damageMultiplier_ = multiplier; } 167 inline float getDamageMultiplier() 168 { return this->damageMultiplier_; } 169 170 164 171 virtual void startLocalHumanControl(); 165 172 … … 208 215 float reloadWaitCountdown_; 209 216 217 // Modifier 218 float damageMultiplier_; // Used by the Damage Boost Pickup. 219 210 220 WeakPtr<Pawn> lastHitOriginator_; 211 221
Note: See TracChangeset
for help on using the changeset viewer.