Merge pull request #73 from cortex-command-community/GI71-ExplosiveTimersResetting

Gi71 explosive timers resetting

Author: garethyr

CHANGELOG.md

@@ -5,6 +5,15 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
 ## [Unreleased]
+### Added
+
+### Changed
+
+### Removed
+
+### Fixed
+
+- Explosives (and other thrown devices) will no longer reset their explosion triggering timer when they're picked up ([Issue #71](https://github.com/cortex-command-community/Cortex-Command-Community-Project-Source/issues/71))
 
 ## [0.0.1.0] - 2020-01-27
 

Entities/ThrownDevice.cpp

@@ -6,7 +6,6 @@ namespace RTE {
 ////////////////////////////////////////////////////////////////////////////////////////////////////
 
 	void ThrownDevice::Clear() {
-		m_ThrownTmr.Reset();
 		m_ActivationSound.Reset();
 		m_StartThrowOffset.Reset();
 		m_EndThrowOffset.Reset();
@@ -35,8 +34,6 @@ namespace RTE {
 
 		m_MOType = MovableObject::TypeThrownDevice;
 
-		m_ThrownTmr = reference.m_ThrownTmr;
-
 		m_ActivationSound = reference.m_ActivationSound;
 
 		m_StartThrowOffset = reference.m_StartThrowOffset;
@@ -105,6 +102,19 @@ namespace RTE {
 		Clear();
 	}
 
+/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+
+	void ThrownDevice::ResetAllTimers() {
+		double elapsedTime;
+		if (m_Activated) {
+			elapsedTime = m_ActivationTmr.GetElapsedSimTimeMS();
+		}
+		HeldDevice::ResetAllTimers();
+		if (m_Activated) {
+			m_ActivationTmr.SetElapsedSimTimeMS(elapsedTime);
+		}
+	}
+
 /////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 
 	void ThrownDevice::Activate() {

Entities/ThrownDevice.h

@@ -76,7 +76,7 @@ namespace RTE {
 		/// <summary>
 		/// Resets all the timers used by this (e.g. emitters, etc). This is to prevent backed up emissions from coming out all at once while this has been held dormant in an inventory.
 		/// </summary>
-		virtual void ResetAllTimers() { HeldDevice::ResetAllTimers(); m_ThrownTmr.Reset(); }
+		virtual void ResetAllTimers();
 
 		/// <summary>
 		/// Activates this Device as long as it's not set to activate when released or it has no parent.
@@ -144,8 +144,6 @@ namespace RTE {
 	protected:
 		static Entity::ClassInfo m_sClass; //! ClassInfo for this class
 
-		Timer m_ThrownTmr; //! Timer for timing how long ago this ThrownDevice was thrown
-
 		Sound m_ActivationSound; //! Activation sound
 
 		Vector m_StartThrowOffset; //! The position offset at which a throw of this Device begins