[Orxonox-commit 3873] r8547 - code/branches/gameimmersion/src/modules/weapons/weaponmodes

[simonmie at orxonox.net]

Author: simonmie
Date: 2011-05-23 17:16:00 +0200 (Mon, 23 May 2011)
New Revision: 8547

Modified:
   code/branches/gameimmersion/src/modules/weapons/weaponmodes/RocketFire.cc
   code/branches/gameimmersion/src/modules/weapons/weaponmodes/SimpleRocketFire.cc
Log:
added set/get shield/health-damage functionality to RocketFire and SimpleRocketFire, made comments

Modified: code/branches/gameimmersion/src/modules/weapons/weaponmodes/RocketFire.cc
===================================================================
--- code/branches/gameimmersion/src/modules/weapons/weaponmodes/RocketFire.cc	2011-05-23 14:14:57 UTC (rev 8546)
+++ code/branches/gameimmersion/src/modules/weapons/weaponmodes/RocketFire.cc	2011-05-23 15:16:00 UTC (rev 8547)
@@ -72,7 +72,7 @@
 
         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());
     }
 }

Modified: code/branches/gameimmersion/src/modules/weapons/weaponmodes/SimpleRocketFire.cc
===================================================================
--- code/branches/gameimmersion/src/modules/weapons/weaponmodes/SimpleRocketFire.cc	2011-05-23 14:14:57 UTC (rev 8546)
+++ code/branches/gameimmersion/src/modules/weapons/weaponmodes/SimpleRocketFire.cc	2011-05-23 15:16:00 UTC (rev 8547)
@@ -22,7 +22,7 @@
  *   Author:
  *      Oliver Scheuss
  *   Co-authors:
- *      ...
+ *      simonmie
  *
  */
 
@@ -61,6 +61,8 @@
     {
     }
 
+    /* Creates the Rocket (RocketController) object, sets its properties to the SimpleRocketFire properties, sets target
+     */
     void SimpleRocketFire::fire()
     {
         RocketController* con = new RocketController(this);
@@ -72,8 +74,8 @@
         rocket->setOwner(this->getWeapon()->getWeaponPack()->getWeaponSystem()->getPawn());
 
         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();
         if (pawnn) con->setTarget(pawnn);