Changeset 8580 for code/branches/presentation/src/modules/weapons/weaponmodes/FusionFire.cc

Timestamp:

May 25, 2011, 9:41:29 PM (13 years ago)

Author:

dafrick

Message:

Merging game immersion branch into presentation branch.

Location:

code/branches/presentation

Files:

• . (modified) (1 prop)
• src/modules/weapons/weaponmodes/FusionFire.cc (modified) (4 diffs)

code/branches/presentation/src/modules/weapons/weaponmodes/FusionFire.cc

@@ -23 +23 @@
  *      Martin Polak
  *   Co-authors:
- *      ...
+ *      simonmie
  *
  */
@@ -48 +48 @@
         this->reloadTime_ = 1.0;
         this->bParallelReload_ = false;
-        this->damage_ = 40;
+        this->damage_ = 0; //default 40
         this->speed_ = 1250;
 
@@ -54 +54 @@
     }
 
+    /* Creates the projectile (BillboardProjectile) object, sets its properties to the FusionFire properties
+     */
     void FusionFire::fire()
     {
@@ -65 +67 @@
         projectile->setOwner(this->getWeapon()->getWeaponPack()->getWeaponSystem()->getPawn());
         projectile->setDamage(this->getDamage());
+        projectile->setShieldDamage(this->getShieldDamage());
+        projectile->setHealthDamage(this->getHealthDamage());
+
         projectile->setColour(ColourValue(1.0f, 0.7f, 0.3f, 1.0f));
     }