Changeset 6419 for code/branches/pickup3/src/modules/weapons

Timestamp:

Dec 25, 2009, 11:07:09 PM (15 years ago)

Author:

rgrieder

Message:

Merged pickup2 into pickup3.

Location:

code/branches/pickup3

Files:

• . (modified) (1 prop)
• src/modules/weapons/projectiles/Projectile.cc (modified) (1 diff)

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

@@ -124 +124 @@
 
             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);