Changeset 8579 for code/branches/presentation/src/modules/weapons/weaponmodes/EnergyDrink.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/EnergyDrink.cc (modified) (4 diffs)

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

@@ -23 +23 @@
  *      Hagen Seifert
  *   Co-authors:
- *      simonmie
+ *      ...
  *
  */
@@ -50 +50 @@
 
         this->reloadTime_ = 0.25;
-        this->damage_ = 0; //default 15
+        this->damage_ = 15;
         this->speed_ = 2500;
         this->delay_ = 0;
@@ -97 +97 @@
     }
 
-    /* Creates the projectile object, sets its properties to the EnergyDrink properties, calls muendungsfeuer()
-     */
     void EnergyDrink::shot()
     {
@@ -114 +112 @@
         projectile->setOwner(this->getWeapon()->getWeaponPack()->getWeaponSystem()->getPawn());
         projectile->setDamage(this->getDamage());
-        projectile->setShieldDamage(this->getShieldDamage());
-        projectile->setHealthDamage(this->getHealthDamage());
 
         EnergyDrink::muendungsfeuer();