From 55ed12f8d1eb6887d348be03aee5573d44177ffb Mon Sep 17 00:00:00 2001
From: Michael Sartain <mikesart@gmail.com>
Date: Thu, 2 Oct 2014 08:25:55 -0700
Subject: Updated the SDK with the latest code from the TF and HL2 branches.

---
 mp/src/game/server/team_train_watcher.cpp | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

(limited to 'mp/src/game/server/team_train_watcher.cpp')

diff --git a/mp/src/game/server/team_train_watcher.cpp b/mp/src/game/server/team_train_watcher.cpp
index b8ef36c3..0d6ebdbd 100644
--- a/mp/src/game/server/team_train_watcher.cpp
+++ b/mp/src/game/server/team_train_watcher.cpp
@@ -73,6 +73,7 @@ BEGIN_DATADESC( CTeamTrainWatcher )
 	DEFINE_INPUTFUNC( FIELD_FLOAT, "SetSpeedForwardModifier", InputSetSpeedForwardModifier ),
 	DEFINE_INPUTFUNC( FIELD_INTEGER, "SetTrainRecedeTime", InputSetTrainRecedeTime ),
 	DEFINE_INPUTFUNC( FIELD_BOOLEAN, "SetTrainCanRecede", InputSetTrainCanRecede ),
+	DEFINE_INPUTFUNC( FIELD_INTEGER, "SetTrainRecedeTimeAndUpdate", InputSetTrainRecedeTimeAndUpdate ),
 
 	// Outputs
 	DEFINE_OUTPUT( m_OnTrainStartRecede, "OnTrainStartRecede" ),
@@ -714,6 +715,24 @@ void CTeamTrainWatcher::InputSetTrainRecedeTime( inputdata_t &inputdata )
 	}
 }
 
+void CTeamTrainWatcher::InputSetTrainRecedeTimeAndUpdate(inputdata_t &inputdata)
+{
+	InputSetTrainRecedeTime( inputdata );
+
+	// update our time if we're already counting down
+	if ( m_flRecedeTime > 0 )
+	{
+		m_flRecedeTotalTime = tf_escort_recede_time.GetFloat();
+		if ( m_nTrainRecedeTime > 0 )
+		{
+			m_flRecedeTotalTime = m_nTrainRecedeTime;
+		}
+
+		m_flRecedeStartTime = gpGlobals->curtime;
+		m_flRecedeTime = m_flRecedeStartTime + m_flRecedeTotalTime;
+	}
+}
+
 void CTeamTrainWatcher::InputSetTrainCanRecede( inputdata_t &inputdata )
 {
 	m_bTrainCanRecede = inputdata.value.Bool();
-- 
cgit v1.2.3