Changeset 8533 for code/branches/gameimmersion/src/orxonox/worldentities/pawns/Pawn.cc

Timestamp:

May 23, 2011, 2:26:25 PM (13 years ago)

Author:

simonmie

Message:

SimpleRocket and Rocket are now BasicProjectiles - damage is working now correctly with these two. More spam messages removed.

File:

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

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

@@ -249 +249 @@
             }
 
-            else { COUT(3) << "## SHIELD : " << this->getShieldHealth() << endl; }
+ //           else { COUT(3) << "## SHIELD : " << this->getShieldHealth() << endl; }
 
             this->setHealth(this->health_ - healthdamage);
@@ -319 +319 @@
     void Pawn::hit(Pawn* originator, const Vector3& force, float damage, float healthdamage, float shielddamage)
     {
-        COUT(3) << "neue hit-Funktion wurde aufgerufen // " << std::flush;
+//        COUT(3) << "neue hit-Funktion wurde aufgerufen // " << std::flush;
         if (this->getGametype() && this->getGametype()->allowPawnHit(this, originator) && (!this->getController() || !this->getController()->getGodMode()) )
         {