Changeset 2864 for code/branches/pickups/src/orxonox/objects/weaponSystem/projectiles

Timestamp:

Mar 30, 2009, 2:27:26 PM (16 years ago)

Author:

danielh

Message:

first commit of pickup system

• working PickupCollection
• working PickupSpawner
• base classes for items
• updated Pawn to include PickupCollection
• updated Projectile to use damage modifier on hit

File:

• code/branches/pickups/src/orxonox/objects/weaponSystem/projectiles/Projectile.cc (modified) (1 diff)

code/branches/pickups/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;