Changeset 6405 for code/branches/pickup2/src/modules/weapons/projectiles/Projectile.cc

Timestamp:

Dec 23, 2009, 8:27:17 PM (14 years ago)

Author:

dafrick

Message:

Commit changes in pickup before merge.

File:

• code/branches/pickup2/src/modules/weapons/projectiles/Projectile.cc (modified) (1 diff)

code/branches/pickup2/src/modules/weapons/projectiles/Projectile.cc

@@ -123 +123 @@
 
             float dmg = this->damage_;
-            if (this->owner_)
-                dmg = this->owner_->getPickups().processModifiers(ModifierType::Damage, dmg, false);
+            //TODO: Remove.
+//             if (this->owner_)
+//                 dmg = this->owner_->getPickups().processModifiers(ModifierType::Damage, dmg, false);
 
             Pawn* victim = orxonox_cast<Pawn*>(otherObject);