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

Timestamp:

May 16, 2011, 5:25:00 PM (13 years ago)

Author:

simonmie

Message:

New Shield effect added (from tibork), first working BasicProjectile class, changes in weapon classes to fit new BasicProjectile system, some spam messages in Pawn.cc removed

File:

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

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

@@ -201 +201 @@
     {
         this->reloadRate_ = reloadrate;
-        COUT(2) << "RELOAD RATE SET TO " << this->reloadRate_ << endl;
+        //COUT(2) << "RELOAD RATE SET TO " << this->reloadRate_ << endl;
     }
 
@@ -207 +207 @@
     {
         this->reloadWaitTime_ = reloadwaittime;
-        COUT(2) << "RELOAD WAIT TIME SET TO " << this->reloadWaitTime_ << endl;
+        //COUT(2) << "RELOAD WAIT TIME SET TO " << this->reloadWaitTime_ << endl;
     }
 
@@ -293 +293 @@
             // play damage effect
         }
-        COUT(3) << "neue damage-Funktion wurde aufgerufen // " << "Shield:" << this->getShieldHealth() << endl;
+        //COUT(3) << "neue damage-Funktion wurde aufgerufen // " << "Shield:" << this->getShieldHealth() << endl;
     }
 
@@ -346 +346 @@
     void Pawn::hit(Pawn* originator, btManifoldPoint& contactpoint, float damage, float healthdamage, float shielddamage)
     {
-        COUT(3) << "neue hit2-Funktion wurde aufgerufen // shielddamage: " << shielddamage << std::flush;
+//        COUT(3) << "neue hit2-Funktion wurde aufgerufen // shielddamage: " << shielddamage << std::flush;
         if (this->getGametype() && this->getGametype()->allowPawnHit(this, originator) && (!this->getController() || !this->getController()->getGodMode()) )
         {