about summary refs log tree commit diff
path: root/src/game/editor
diff options
context:
space:
mode:
authoroy <Tom_Adams@web.de>2011-04-13 17:47:02 +0200
committeroy <Tom_Adams@web.de>2011-04-13 17:47:02 +0200
commit876eac10484c4f4a29a64126ad2be5866baaf687 (patch)
treec2abc3e305c08b1e1bb9721bbcf2f502cc84d027 /src/game/editor
parent537e5fa7b6f99a982b7a9cda8587624fc1f49a3a (diff)
downloadzcatch-876eac10484c4f4a29a64126ad2be5866baaf687.tar.gz
zcatch-876eac10484c4f4a29a64126ad2be5866baaf687.zip
added fix to make [Shift] only change the time of the point and not his value for envelopes in map editor by Choupon
Diffstat (limited to 'src/game/editor')
-rw-r--r--src/game/editor/ed_editor.cpp14
1 files changed, 8 insertions, 6 deletions
diff --git a/src/game/editor/ed_editor.cpp b/src/game/editor/ed_editor.cpp
index d2515e44..1163dc4a 100644
--- a/src/game/editor/ed_editor.cpp
+++ b/src/game/editor/ed_editor.cpp
@@ -2849,12 +2849,7 @@ void CEditor::RenderEnvelopeEditor(CUIRect View)
 							s_Move = false;
 						}
 						else
-						{
-							if((Input()->KeyPressed(KEY_LCTRL) || Input()->KeyPressed(KEY_RCTRL)))
-								pEnvelope->m_lPoints[i].m_aValues[c] -= f2fx(m_MouseDeltaY*0.001f);
-							else
-								pEnvelope->m_lPoints[i].m_aValues[c] -= f2fx(m_MouseDeltaY*ValueScale);
-							
+						{							
 							if(Input()->KeyPressed(KEY_LSHIFT) || Input()->KeyPressed(KEY_RSHIFT))
 							{
 								if(i != 0)
@@ -2869,6 +2864,13 @@ void CEditor::RenderEnvelopeEditor(CUIRect View)
 										pEnvelope->m_lPoints[i].m_Time = pEnvelope->m_lPoints[i+1].m_Time - 1;
 								}
 							}
+							else
+							{
+								if((Input()->KeyPressed(KEY_LCTRL) || Input()->KeyPressed(KEY_RCTRL)))
+									pEnvelope->m_lPoints[i].m_aValues[c] -= f2fx(m_MouseDeltaY*0.001f);
+								else
+									pEnvelope->m_lPoints[i].m_aValues[c] -= f2fx(m_MouseDeltaY*ValueScale);
+							}
 							m_Map.m_Modified = true;
 						}