Changeset 8547 for code/branches/gameimmersion

Timestamp:

May 23, 2011, 5:16:00 PM (14 years ago)

Author:

simonmie

Message:

added set/get shield/health-damage functionality to RocketFire and SimpleRocketFire, made comments

Location:

code/branches/gameimmersion/src/modules/weapons/weaponmodes

Files:

• RocketFire.cc (modified) (1 diff)
• SimpleRocketFire.cc (modified) (3 diffs)

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

@@ -73 +73 @@
         rocket->setOwner(this->getWeapon()->getWeaponPack()->getWeaponSystem()->getPawn());
         rocket->setDamage(this->getDamage());
-//        rocket->setShieldDamage(this->getShieldDamage()); //correct this!
-//        rocket->setHealthDamage(this->getHealthDamage());
+        rocket->setShieldDamage(this->getShieldDamage());
+        rocket->setHealthDamage(this->getHealthDamage());
     }
 }

code/branches/gameimmersion/src/modules/weapons/weaponmodes/SimpleRocketFire.cc

@@ -23 +23 @@
  *      Oliver Scheuss
  *   Co-authors:
- *      ...
+ *      simonmie
  *
  */
@@ -62 +62 @@
     }
 
+    /* Creates the Rocket (RocketController) object, sets its properties to the SimpleRocketFire properties, sets target
+     */
     void SimpleRocketFire::fire()
     {
@@ -73 +75 @@
 
         rocket->setDamage(this->damage_);
-//        rocket->setShieldDamage(this->getShieldDamage());
-//        rocket->setHealthDamage(this->getHealthDamage());
+        rocket->setShieldDamage(this->getShieldDamage());
+        rocket->setHealthDamage(this->getHealthDamage());
 
         WorldEntity* pawnn=static_cast<ControllableEntity*>(this->getWeapon()->getWeaponPack()->getWeaponSystem()->getPawn())->getTarget();