Changeset 6894 for code/branches/ppspickups3/src

Timestamp:

May 10, 2010, 4:52:34 PM (14 years ago)

Author:

ebeier

Message:

cout again -.-

File:

• code/branches/ppspickups3/src/orxonox/worldentities/pawns/Pawn.cc (modified) (2 diffs)

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

@@ -175 +175 @@
             {
                 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);
@@ -186 +185 @@
             {
                 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;
             }