Changeset 8550

Timestamp:

May 23, 2011, 5:59:48 PM (13 years ago)

Author:

simonmie

Message:

again comments for BasicProjectile

File:

• code/branches/gameimmersion/src/modules/weapons/projectiles/BasicProjectile.cc (modified) (2 diffs)

code/branches/gameimmersion/src/modules/weapons/projectiles/BasicProjectile.cc

@@ -50 +50 @@
         this->bDestroy_ = false;
 
+        // Default damage must be zero, otherwise it would be above zero if no settings are made in the weaponsettings xml file.
+        // same thing for all weaponmodes files
         this->damage_ = 0;
         this->healthdamage_ = 0;
@@ -89 +91 @@
             if (owner) //if the owner does not exist (anymore?), no effects are displayed.
             {
-                if (!victim || (victim && !victim->hasShield()))
+                // damping and explosion effect is only played if the victim is no pawn (see cast above)
+                // or if the victim is a pawn, has no shield left, is still alive and any damage goes to the health
+                if (!victim || (victim && !victim->hasShield() && victim->getHealth() > 0 && (this_->getDamage() > 0 || this_->getHealthDamage() > 0)))
                 {
                     {