about summary refs log tree commit diff
path: root/src/game/client/components
diff options
context:
space:
mode:
authorFujnky <larsfunke1996@gmail.com>2010-06-02 21:47:47 +0200
committerFujnky <larsfunke1996@gmail.com>2010-06-02 21:47:47 +0200
commit64ddee0a218e8ae0af4936148850e334d3c02c6b (patch)
treedf24bdb7f5d775fc76d31138bdccfa293404f0bd /src/game/client/components
parent0d4c0ccef5f97287dac9db8261daa09eb9d353a6 (diff)
parent7a1953e60b58544144986d30cb30acfab6e0d465 (diff)
downloadzcatch-64ddee0a218e8ae0af4936148850e334d3c02c6b.tar.gz
zcatch-64ddee0a218e8ae0af4936148850e334d3c02c6b.zip
Merge branch 'master' of git://github.com/matricks/teeworlds
Diffstat (limited to 'src/game/client/components')
-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;