Changeset 6980 for code/branches/ppspickups3/src/orxonox

Timestamp:

May 27, 2010, 7:05:36 PM (15 years ago)

Author:

ebeier

Message:

created more pickup representations, prepared pickup-level for presentation, removed debug code etc.

File:

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

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

@@ -80 +80 @@
         else
             this->weaponSystem_ = 0;
-        
+
         this->setCarrierName("Pawn");
 
@@ -107 +107 @@
         XMLPortParam(Pawn, "maxhealth", setMaxHealth, getMaxHealth, xmlelement, mode).defaultValues(200);
         XMLPortParam(Pawn, "initialhealth", setInitialHealth, getInitialHealth, xmlelement, mode).defaultValues(100);
-        
+
         XMLPortParam(Pawn, "shieldhealth", setShieldHealth, getShieldHealth, xmlelement, mode).defaultValues(0);
         XMLPortParam(Pawn, "shieldabsorption", setShieldAbsorption, getShieldAbsorption, xmlelement, mode).defaultValues(0);
-        
+
         XMLPortParam(Pawn, "spawnparticlesource", setSpawnParticleSource, getSpawnParticleSource, xmlelement, mode);
         XMLPortParam(Pawn, "spawnparticleduration", setSpawnParticleDuration, getSpawnParticleDuration, xmlelement, mode).defaultValues(3.0f);
@@ -170 +170 @@
             float shielddamage = damage*this->shieldAbsorption_;
             float healthdamage = damage*(1-this->shieldAbsorption_);
-            
+
             // In case the shield can not take all the shield damage.
-            if (shielddamage > this->getShieldHealth()) 
+            if (shielddamage > this->getShieldHealth())
             {
-                COUT(1) << "the shield is too weak to take its share of the damage!" << std::endl;
-
                 healthdamage += shielddamage-this->getShieldHealth();
                 this->setShieldHealth(0);
@@ -181 +179 @@
 
             this->setHealth(this->health_ - healthdamage);
-            
+
             if (this->getShieldHealth() > 0)
             {
                 this->setShieldHealth(this->shieldHealth_ - shielddamage);
-                COUT(1) << "damage " << damage  << " getShieldAbsorption " << getShieldAbsorption() << 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;
             }
 
@@ -195 +190 @@
         }
     }
-    
+
     void Pawn::hit(Pawn* originator, const Vector3& force, float damage)
     {