about summary refs log tree commit diff
path: root/src/game/client/components/controls.cpp
diff options
context:
space:
mode:
authorxalduin <xalduin@gmail.com>2010-06-02 15:21:31 -0400
committerxalduin <xalduin@gmail.com>2010-06-02 15:21:31 -0400
commitcc181cda5be79c1097502ea30afb78400da962b7 (patch)
treeaa451cb046ef489dbbd7007f1cceb029e5879e48 /src/game/client/components/controls.cpp
parent9e6c9096248dc35a354050749b460fafdd21df7f (diff)
parent7a1953e60b58544144986d30cb30acfab6e0d465 (diff)
downloadzcatch-cc181cda5be79c1097502ea30afb78400da962b7.tar.gz
zcatch-cc181cda5be79c1097502ea30afb78400da962b7.zip
Merge remote branch 'upstream/master'
Diffstat (limited to 'src/game/client/components/controls.cpp')
-rw-r--r--src/game/client/components/controls.cpp5
1 files changed, 4 insertions, 1 deletions
diff --git a/src/game/client/components/controls.cpp b/src/game/client/components/controls.cpp
index 0b4918b2..7b3f4716 100644
--- a/src/game/client/components/controls.cpp
+++ b/src/game/client/components/controls.cpp
@@ -19,7 +19,10 @@ void CControls::OnReset()
 {
 	m_LastData.m_Direction = 0;
 	m_LastData.m_Hook = 0;
-	m_LastData.m_Fire = 0;
+	// simulate releasing the fire button
+	if((m_LastData.m_Fire&1) != 0)
+		m_LastData.m_Fire++;
+	m_LastData.m_Fire &= INPUT_STATE_MASK;
 	m_LastData.m_Jump = 0;
 	m_InputData = m_LastData;