Changeset 8533 for code/branches/gameimmersion/src/orxonox

Timestamp:

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

Author:

simonmie

Message:

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

Location:

code/branches/gameimmersion/src/orxonox

Files:

• weaponsystem/WeaponMode.h (modified) (2 diffs)
• worldentities/pawns/Pawn.cc (modified) (2 diffs)

code/branches/gameimmersion/src/orxonox/weaponsystem/WeaponMode.h

@@ -104 +104 @@
             // Fire
             inline void setDamage(float damage)
-                { this->damage_ = damage; COUT(3) << "DAMAGE-SET-FUNKTION (WeaponMode) WIRD AUFGERUFEN" << endl;}
+                { this->damage_ = damage;}
             inline float getDamage() const
                 { return this->damage_; }
@@ -115 +115 @@
 
             inline void setShieldDamage(float shielddamage)
-                { this->shielddamage_ = shielddamage;} //ShieldDamage wird korrekt gesettet vom XML-File
+                { this->shielddamage_ = shielddamage;}
             inline float getShieldDamage() const
                 { return this->shielddamage_; }

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()) )
         {