Changeset 3073 for code/trunk/src/orxonox/objects/weaponsystem

Timestamp:

May 25, 2009, 8:30:15 PM (16 years ago)

Author:

landauf

Message:

merged pickups2 branch back to trunk. not yet tested.

Location:

code/trunk

Files:

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

code/trunk

@@ -1 +1 @@
 build
 codeblocks
+dependencies

@@ -1 +1 @@
 build
 codeblocks
+dependencies

code/trunk/src/orxonox/objects/weaponsystem/projectiles/Projectile.cc

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

@@ -1 +1 @@
 build
 codeblocks
+dependencies