Changeset 9348 for code/trunk/src/orxonox/worldentities/pawns/Pawn.h
- Timestamp:
- Aug 30, 2012, 11:08:17 PM (12 years ago)
- Location:
- code/trunk
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
code/trunk
- Property svn:ignore
-
old new 1 .project 1 2 build 2 3 codeblocks 4 dependencies 3 5 vs 4 dependencies
-
- Property svn:mergeinfo changed
- Property svn:ignore
-
code/trunk/src/orxonox/worldentities/pawns/Pawn.h
r9254 r9348 144 144 virtual void addedWeaponPack(WeaponPack* wPack) {} 145 145 146 inline const WorldEntity* getWorldEntity() const147 { return const_cast<Pawn*>(this); }148 149 146 inline void setSpawnParticleSource(const std::string& source) 150 147 { this->spawnparticlesource_ = source; } … … 162 159 { return this->numexplosionchunks_; } 163 160 161 // These are used with the Damage Boost Pickup to use the damage multiplier. 162 inline void setDamageMultiplier(float multiplier) 163 { this->damageMultiplier_ = multiplier; } 164 inline float getDamageMultiplier() const 165 { return this->damageMultiplier_; } 166 167 164 168 virtual void startLocalHumanControl(); 165 169 … … 203 207 float maxShieldHealth_; 204 208 float initialShieldHealth_; 205 float shieldAbsorption_; // Has to be between 0 and 1209 float shieldAbsorption_; ///< Has to be between 0 and 1 206 210 float reloadRate_; 207 211 float reloadWaitTime_; 208 212 float reloadWaitCountdown_; 213 214 float damageMultiplier_; ///< Used by the Damage Boost Pickup. 209 215 210 216 WeakPtr<Pawn> lastHitOriginator_;
Note: See TracChangeset
for help on using the changeset viewer.