diff options
| author | oy <Tom_Adams@web.de> | 2010-10-13 12:47:42 +0200 |
|---|---|---|
| committer | oy <Tom_Adams@web.de> | 2010-10-13 12:47:42 +0200 |
| commit | e4fe7457c8acdb479e91a79cf832c48d10898be5 (patch) | |
| tree | e16e3d219060b1f366720c1663ef661086c8224e /src/game/editor | |
| parent | c828f7d725d9b243e094b44f62a844a9b47790a5 (diff) | |
| download | zcatch-e4fe7457c8acdb479e91a79cf832c48d10898be5.tar.gz zcatch-e4fe7457c8acdb479e91a79cf832c48d10898be5.zip | |
fixed problems with the mouse movement. Closes #214
Diffstat (limited to 'src/game/editor')
| -rw-r--r-- | src/game/editor/ed_editor.cpp | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/src/game/editor/ed_editor.cpp b/src/game/editor/ed_editor.cpp index 295f72b9..8d1be882 100644 --- a/src/game/editor/ed_editor.cpp +++ b/src/game/editor/ed_editor.cpp @@ -3194,8 +3194,8 @@ void CEditor::DoMapBorder() void CEditor::UpdateAndRender() { - static int s_MouseX = 0; - static int s_MouseY = 0; + static float s_MouseX = 0.0f; + static float s_MouseY = 0.0f; if(m_Animate) m_AnimateTime = (time_get()-m_AnimateStart)/(float)time_freq(); @@ -3205,7 +3205,7 @@ void CEditor::UpdateAndRender() // handle mouse movement float mx, my, Mwx, Mwy; - int rx, ry; + float rx, ry; { Input()->MouseRelative(&rx, &ry); m_MouseDeltaX = rx; @@ -3217,10 +3217,8 @@ void CEditor::UpdateAndRender() s_MouseY += ry; } - if(s_MouseX < 0) s_MouseX = 0; - if(s_MouseY < 0) s_MouseY = 0; - if(s_MouseX > UI()->Screen()->w) s_MouseX = (int)UI()->Screen()->w; - if(s_MouseY > UI()->Screen()->h) s_MouseY = (int)UI()->Screen()->h; + clamp(s_MouseX, 0.0f, UI()->Screen()->w); + clamp(s_MouseY, 0.0f, UI()->Screen()->h); // update the ui mx = s_MouseX; |