Changeset 8855 for code/trunk/src/orxonox

Timestamp:

Aug 22, 2011, 3:05:26 PM (13 years ago)

Author:

dafrick

Message:

Cleaning up game immersion. Roughly documenting weapons module.

Location:

code/trunk/src/orxonox/worldentities/pawns

Files:

• Pawn.cc (modified) (2 diffs)
• Pawn.h (modified) (3 diffs)

code/trunk/src/orxonox/worldentities/pawns/Pawn.cc

@@ -47 +47 @@
 #include "weaponsystem/WeaponSet.h"
 
-
 namespace orxonox
 {
@@ -256 +255 @@
 
 */
-
     void Pawn::hit(Pawn* originator, const Vector3& force, float damage, float healthdamage, float shielddamage)
     {

code/trunk/src/orxonox/worldentities/pawns/Pawn.h

@@ -75 +75 @@
 
             inline float getShieldHealth()
-            { return this->shieldHealth_; }
+                { return this->shieldHealth_; }
 
             inline void addShieldHealth(float amount)
-            { this->setShieldHealth(this->shieldHealth_ + amount); }
+                { this->setShieldHealth(this->shieldHealth_ + amount); }
 
             inline bool hasShield()
-            { return (this->getShieldHealth() > 0); }
+                { return (this->getShieldHealth() > 0); }
 
             virtual void setMaxShieldHealth(float maxshieldhealth);
@@ -98 +98 @@
 
             inline void setShieldAbsorption(float shieldAbsorption)
-            { this->shieldAbsorption_ = shieldAbsorption; }
+                { this->shieldAbsorption_ = shieldAbsorption; }
             inline float getShieldAbsorption()
-            { return this->shieldAbsorption_; }
+                { return this->shieldAbsorption_; }
 
             // TODO: Rename to shieldRechargeRate
@@ -112 +112 @@
 
             inline void resetReloadCountdown()
-            { this->reloadWaitCountdown_ = 0; }
+                { this->reloadWaitCountdown_ = 0; }
 
             inline void startReloadCountdown()
-            { this->reloadWaitCountdown_ = this->getReloadWaitTime(); } // TODO: Implement in Projectile.cc
+                { this->reloadWaitCountdown_ = this->getReloadWaitTime(); } // TODO: Implement in Projectile.cc
 
             virtual void decreaseReloadCountdownTime(float dt);