[Orxonox-commit 2179] r6895 - code/branches/ppspickups3/src/orxonox/worldentities/pawns

benedict at orxonox.net benedict at orxonox.net
Mon May 10 16:57:42 CEST 2010


Author: benedict
Date: 2010-05-10 16:57:42 +0200 (Mon, 10 May 2010)
New Revision: 6895

Modified:
   code/branches/ppspickups3/src/orxonox/worldentities/pawns/Pawn.cc
Log:
high on cpout


Modified: code/branches/ppspickups3/src/orxonox/worldentities/pawns/Pawn.cc
===================================================================
--- code/branches/ppspickups3/src/orxonox/worldentities/pawns/Pawn.cc	2010-05-10 14:52:34 UTC (rev 6894)
+++ code/branches/ppspickups3/src/orxonox/worldentities/pawns/Pawn.cc	2010-05-10 14:57:42 UTC (rev 6895)
@@ -64,7 +64,7 @@
         this->maxHealth_ = 0;
         this->initialHealth_ = 0;
         this->shieldHealth_ = 0;
-        this->shieldAbsorption_ = 0;
+        this->shieldAbsorption_ = 0.5;
 
         this->lastHitOriginator_ = 0;
 
@@ -184,8 +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) << "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;
             }
 




More information about the Orxonox-commit mailing list