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

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.h (modified) (2 diffs)

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

@@ -44 +44 @@
     @brief
         A Mine that explodes when a ship is too close
-    @author
-        Fabien Vultier
     @ingroup WeaponsWeaponModes
     */
@@ -56 +54 @@
             virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);
             virtual void fire();
-            inline void setLifeTime(float lifeTime)
-                { this->lifeTime_ = lifeTime; }
-            inline float getLifeTime() const
-                { return this->lifeTime_; }
 
-       private:
+            inline float getMaxTimeUntilExplosion() const
+                { return this->maxTimeUntilExplosion_; }
+            inline float getTimeUntilActivation() const
+                { return this->timeUntilActivation_; }
+        protected:
+            inline void setMaxTimeUntilExplosion(float maxTimeUntilExplosion)
+                { this->maxTimeUntilExplosion_ = maxTimeUntilExplosion; }
+            inline void setTimeUntilActivation(float timeUntilActivation)
+                { this->timeUntilActivation_ = timeUntilActivation; }
+        private:
             float speed_; //The speed of the fired projectile.
-            float lifeTime_;
-
+            float maxTimeUntilExplosion_;
+            float timeUntilActivation_;
     };
 }