[Orxonox-commit 2178] r6894 - code/branches/ppspickups3/src/orxonox/worldentities/pawns

[ebeier at orxonox.net]

Author: ebeier
Date: 2010-05-10 16:52:34 +0200 (Mon, 10 May 2010)
New Revision: 6894

Modified:
   code/branches/ppspickups3/src/orxonox/worldentities/pawns/Pawn.cc
Log:
cout again -.-


Modified: code/branches/ppspickups3/src/orxonox/worldentities/pawns/Pawn.cc
===================================================================
--- code/branches/ppspickups3/src/orxonox/worldentities/pawns/Pawn.cc	2010-05-10 14:49:45 UTC (rev 6893)
+++ code/branches/ppspickups3/src/orxonox/worldentities/pawns/Pawn.cc	2010-05-10 14:52:34 UTC (rev 6894)
@@ -174,8 +174,7 @@
             if (shielddamage > this->getShieldHealth()) 
             {
                 COUT(1) << "the shield is too weak to take its share of the damage!" << std::endl;
-                COUT(1) << "damage" << damage  << "shieldAbsorption" << this->shieldAbsorption_ << std::endl;
-                COUT(1) << "shielddamage" << shielddamage  << "healthdamage" << healthdamage << std::endl;
+
                 healthdamage += shielddamage-this->getShieldHealth();
                 this->setShieldHealth(0);
             }
@@ -185,6 +184,8 @@
             if (this->getShieldHealth() > 0)
             {
                 this->setShieldHealth(this->shieldHealth_ - shielddamage);
+                COUT(1) << "damage" << damage  << "shieldAbsorption" << this->shieldAbsorption_ << std::endl;
+                COUT(1) << "shielddamage" << shielddamage  << "healthdamage" << healthdamage << std::endl;
                 COUT(1) << "the shield takes its share of the damage and is left with " << this->getShieldHealth() << std::endl;
             }