Changeset 2917 for code/branches/pickups2/src/orxonox/objects/weaponSystem/projectiles/Projectile.cc

Timestamp:

Apr 15, 2009, 5:03:58 PM (16 years ago)

Author:

landauf

Message:

merged pickup into pickup2

Location:

code/branches/pickups2

Files:

• . (modified) (2 props)
• src/orxonox/objects/weaponSystem/projectiles/Projectile.cc (modified) (1 diff)

code/branches/pickups2/src/orxonox/objects/weaponSystem/projectiles/Projectile.cc

@@ -124 +124 @@
 
             Pawn* victim = dynamic_cast<Pawn*>(otherObject);
+
+            float dmg = this->damage_;
+            if (this->owner_)
+                dmg = this->owner_->getPickups().processModifiers(ModifierType::Damage, dmg, false);
+
             if (victim)
-                victim->damage(this->damage_, this->owner_);
+                victim->damage(dmg, this->owner_);
         }
         return false;