diff options
| author | Fujnky <larsfunke1996@gmail.com> | 2010-06-02 21:47:47 +0200 |
|---|---|---|
| committer | Fujnky <larsfunke1996@gmail.com> | 2010-06-02 21:47:47 +0200 |
| commit | 64ddee0a218e8ae0af4936148850e334d3c02c6b (patch) | |
| tree | df24bdb7f5d775fc76d31138bdccfa293404f0bd /src | |
| parent | 0d4c0ccef5f97287dac9db8261daa09eb9d353a6 (diff) | |
| parent | 7a1953e60b58544144986d30cb30acfab6e0d465 (diff) | |
| download | zcatch-64ddee0a218e8ae0af4936148850e334d3c02c6b.tar.gz zcatch-64ddee0a218e8ae0af4936148850e334d3c02c6b.zip | |
Merge branch 'master' of git://github.com/matricks/teeworlds
Diffstat (limited to 'src')
| -rw-r--r-- | src/game/client/components/controls.cpp | 5 | ||||
| -rw-r--r-- | src/game/editor/ed_editor.cpp | 8 |
2 files changed, 12 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; diff --git a/src/game/editor/ed_editor.cpp b/src/game/editor/ed_editor.cpp index b2b3e1ca..387ce104 100644 --- a/src/game/editor/ed_editor.cpp +++ b/src/game/editor/ed_editor.cpp @@ -1029,6 +1029,14 @@ void CEditor::DoQuadPoint(CQuad *q, int QuadIndex, int v) s_Operation = OP_CONTEXT_MENU; m_SelectedQuad = QuadIndex; UI()->SetActiveItem(pId); + if(!(m_SelectedPoints&(1<<v))) + { + if(Input()->KeyPressed(KEY_LSHIFT) || Input()->KeyPressed(KEY_RSHIFT)) + m_SelectedPoints |= 1<<v; + else + m_SelectedPoints = 1<<v; + s_Moved = true; + } } } else |