Changeset 8579 for code/branches/presentation/src/modules/weapons/weaponmodes/RocketFire.cc

Timestamp:

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

Author:

dafrick

Message:

Reverse merge to revert last, failed, merge. Apparently you can't partially commit a merge.

File:

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

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

@@ -23 +23 @@
  *      Oliver Scheuss
  *   Co-authors:
- *      simonmie
+ *      ...
  *
  */
@@ -48 +48 @@
         this->reloadTime_ = 0.20f;
         this->bParallelReload_ = false;
-        this->damage_ = 0;
+        this->damage_ = 100;
         this->speed_ = 500;
 
@@ -59 +59 @@
     }
 
-    /* Creates the Rocket object, sets its properties to the RocketFire properties
-     */
     void RocketFire::fire()
     {
@@ -73 +71 @@
         rocket->setOwner(this->getWeapon()->getWeaponPack()->getWeaponSystem()->getPawn());
         rocket->setDamage(this->getDamage());
-        rocket->setShieldDamage(this->getShieldDamage());
-        rocket->setHealthDamage(this->getHealthDamage());
     }
 }