about summary refs log tree commit diff
path: root/src/game/editor/ed_editor.cpp
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/editor/ed_editor.cpp
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/editor/ed_editor.cpp')
-rw-r--r--src/game/editor/ed_editor.cpp8
1 files changed, 8 insertions, 0 deletions
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