Changeset 10889 for code/branches/particleEffectsHS15/src/modules/weapons/weaponmodes/MineGun.cc

Timestamp:

Nov 29, 2015, 9:05:26 PM (9 years ago)

Author:

fvultier

Message:

promised wor for Jannis.

File:

• code/branches/particleEffectsHS15/src/modules/weapons/weaponmodes/MineGun.cc (modified) (4 diffs)

code/branches/particleEffectsHS15/src/modules/weapons/weaponmodes/MineGun.cc

@@ -51 +51 @@
         RegisterObject(MineGun);
 
+        this->speed_ = 0.0f;
         this->reloadTime_ = 1.0f;
         this->damage_ = 0.0f;
-        this->speed_ = 0.0f;
-        this->lifeTime_ = 7500.0f;
+        this->maxTimeUntilExplosion_ = 0.0f;
 
         this->setMunitionName("MineMunition");
@@ -66 +66 @@
     /**
     @brief
-        XMLPort for the MineGun. You can define how often the projectiles Mine, how many childs should be created per Mine, the spread and the time between two Mines.
+        XMLPort for the MineGun.
     */
     void MineGun::XMLPort(Element& xmlelement, XMLPort::Mode mode)
     {
         SUPER(MineGun, XMLPort, xmlelement, mode);
-        XMLPortParam(MineGun, "Lifetime", setLifeTime, getLifeTime, xmlelement, mode);
+
+        XMLPortParam(MineGun, "maxtimeuntilexplosion", setMaxTimeUntilExplosion, getMaxTimeUntilExplosion, xmlelement, mode).defaultValues(10.0f);
+        XMLPortParam(MineGun, "timeuntilactivation", setTimeUntilActivation, getTimeUntilActivation, xmlelement, mode).defaultValues(3.0f);
     }
 
@@ -81 +83 @@
     {
         MineProjectile* projectile = new MineProjectile(this->getContext());
-        //projectile->setMaterial("Flares/energyflare");
 
         this->computeMuzzleParameters(this->getWeapon()->getWeaponPack()->getWeaponSystem()->getPawn()->getAimPosition());
@@ -88 +89 @@
         projectile->setVelocity(this->getMuzzleDirection() * this->speed_);
 
-        // Pass important information to the projectile: Number of Mines, Number of childs, Mine time, spread and the damage reduction
-        /*projectile->setNumberOfMines(getNumberOfMines());
-        projectile->setNumberOfChilds(getNumberOfChilds());*/
-        projectile->setLifeTime(getLifeTime());
-        /*projectile->setSpread(getSpread());
-        projectile->setDamageReduction(getDamageReduction());*/
+        projectile->setMaxTimeUntilExplosion(getMaxTimeUntilExplosion());
+        projectile->setTimeUntilActivation(getTimeUntilActivation());
 
         projectile->setShooter(this->getWeapon()->getWeaponPack()->getWeaponSystem()->getPawn());