Changeset 8553

Timestamp:

May 23, 2011, 6:41:25 PM (14 years ago)

Author:

simonmie

Message:

added more comments, removed code marks, changed strange (wrong?) hit call

File:

• code/branches/gameimmersion/src/orxonox/worldentities/pawns/Pawn.cc (modified) (13 diffs)

code/branches/gameimmersion/src/orxonox/worldentities/pawns/Pawn.cc

@@ -152 +152 @@
         this->bReload_ = false;
 
-////////me
+        // TODO: use the existing timer functions instead
         if(this->reloadWaitCountdown_ > 0)
         {
@@ -163 +163 @@
         }
 
-////////end me
         if (GameMode::isMaster())
+        {
             if (this->health_ <= 0 && bAlive_)
             {
@@ -170 +170 @@
                 this->death();
             }
+        }
     }
 
@@ -195 +196 @@
     }
 
-//////////////////me
+
+    void Pawn::setHealth(float health)
+    {
+        this->health_ = std::min(health, this->maxHealth_); //Health can't be set to a value bigger than maxHealth, otherwise it will be reduced at first hit
+    }
+
+    void Pawn::setShieldHealth(float shieldHealth)
+    {
+        this->shieldHealth_ = std::min(shieldHealth, this->maxShieldHealth_);
+    }
+
+    void Pawn::setMaxShieldHealth(float maxshieldhealth)
+    {
+        this->maxShieldHealth_ = maxshieldhealth;
+    }
+
     void Pawn::setReloadRate(float reloadrate)
     {
         this->reloadRate_ = reloadrate;
-        //COUT(2) << "RELOAD RATE SET TO " << this->reloadRate_ << endl;
     }
 
@@ -205 +220 @@
     {
         this->reloadWaitTime_ = reloadwaittime;
-        //COUT(2) << "RELOAD WAIT TIME SET TO " << this->reloadWaitTime_ << endl;
     }
 
@@ -213 +227 @@
     }
 
-    void Pawn::setMaxShieldHealth(float maxshieldhealth)
-    {
-        this->maxShieldHealth_ = maxshieldhealth;
-    }
-
-    void Pawn::setShieldHealth(float shieldHealth)
-    {
-        this->shieldHealth_ = std::min(shieldHealth, this->maxShieldHealth_);
-    }
-
-///////////////end me
-
-    void Pawn::setHealth(float health)
-    {
-        this->health_ = std::min(health, this->maxHealth_); //Health can't be set to a value bigger than maxHealth, otherwise it will be reduced at first hit
-    }
-
-//////////////////me edit
+    /* Old damage function.
+     * For effects causing only damage not specifically to shield or health
+     */
     void Pawn::damage(float damage, Pawn* originator)
     {
-                COUT(3) << "### alte damage-funktion ###" << endl;
         if (this->getGametype() && this->getGametype()->allowPawnDamage(this, originator))
         {
@@ -247 +245 @@
             }
 
- //           else { COUT(3) << "## SHIELD : " << this->getShieldHealth() << endl; }
-
             this->setHealth(this->health_ - healthdamage);
 
@@ -261 +257 @@
         }
     }
-////////////////////end edit
-
-
-/////////////////////me override
+
+    /* Does damage to the pawn, splits it up to shield and health.
+     * Sets lastHitOriginator.
+     */
     void Pawn::damage(float damage, float healthdamage, float shielddamage, Pawn* originator)
     {
@@ -291 +287 @@
             // play damage effect
         }
-        //COUT(3) << "neue damage-Funktion wurde aufgerufen // " << "Shield:" << this->getShieldHealth() << endl;
-    }
-
-/////////////end me
+    }
 
 
 /* HIT-Funktionen
-        Die hit-Funktionen muessen auch in src/orxonox/controllers/Controller.h angepasst werden!
+        Die hit-Funktionen muessen auch in src/orxonox/controllers/Controller.h angepasst werden! (Visuelle Effekte)
 
 */
 
-
+    /* Old hit function, calls the old damage function and changes velocity vector
+     */
     void Pawn::hit(Pawn* originator, const Vector3& force, float damage)
     {
@@ -314 +308 @@
     }
 
-/////////////me override
+    /* calls the damage function and adds the force that hit the pawn to the velocity vector
+     */
     void Pawn::hit(Pawn* originator, const Vector3& force, float damage, float healthdamage, float shielddamage)
     {
-//        COUT(3) << "neue hit-Funktion wurde aufgerufen // " << std::flush;
         if (this->getGametype() && this->getGametype()->allowPawnHit(this, originator) && (!this->getController() || !this->getController()->getGodMode()) )
         {
@@ -326 +320 @@
         }
     }
-/////////////end me
-
+
+    /* Old hit (2) function, calls the old damage function and hits controller
+     */
     void Pawn::hit(Pawn* originator, btManifoldPoint& contactpoint, float damage)
     {
@@ -341 +336 @@
     }
 
-/////////////me override
+    /* Hit (2) function, calls the damage function and hits controller
+     */
     void Pawn::hit(Pawn* originator, btManifoldPoint& contactpoint, float damage, float healthdamage, float shielddamage)
     {
-//        COUT(3) << "neue hit2-Funktion wurde aufgerufen // shielddamage: " << shielddamage << std::flush;
         if (this->getGametype() && this->getGametype()->allowPawnHit(this, originator) && (!this->getController() || !this->getController()->getGodMode()) )
         {
@@ -350 +345 @@
 
             if ( this->getController() )
-                this->getController()->hit(originator, contactpoint, shielddamage);
+                this->getController()->hit(originator, contactpoint, damage); // changed to damage, why shielddamage?
 
             // play hit effect
         }
     }
-/////////////end me
+
 
     void Pawn::kill()