Changeset 8578 for code/branches/presentation/src/modules/weapons/weaponmodes/LaserFire.cc

Timestamp:

May 25, 2011, 9:22:53 PM (14 years ago)

Author:

dafrick

Message:

Merging game immersion branch into presentation branch.

File:

• code/branches/presentation/src/modules/weapons/weaponmodes/LaserFire.cc (modified) (4 diffs)

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

@@ -23 +23 @@
  *      Martin Polak
  *   Co-authors:
- *      ...
+ *      simonmie
  *
  */
@@ -45 +45 @@
 
         this->reloadTime_ = 0.25;
-        this->damage_ = 15;
+        this->damage_ = 0; //default 15
         this->speed_ = 1250;
 
@@ -51 +51 @@
     }
 
+    /* Creates the projectile object, sets its properties to the LaserFire properties
+     */
     void LaserFire::fire()
     {
@@ -61 +63 @@
         projectile->setOwner(this->getWeapon()->getWeaponPack()->getWeaponSystem()->getPawn());
         projectile->setDamage(this->getDamage());
+        projectile->setShieldDamage(this->getShieldDamage());
+        projectile->setHealthDamage(this->getHealthDamage());
     }
 }