diff options
author | frosch <frosch@openttd.org> | 2015-02-22 23:06:45 +0000 |
---|---|---|
committer | frosch <frosch@openttd.org> | 2015-02-22 23:06:45 +0000 |
commit | 352e528cdab81f1903f13260dedb34d1b113b6e8 (patch) | |
tree | 138854a4db9517f6455825ad79acdfbac9151d9d /src/video/win32_v.cpp | |
parent | fece468d9678fd11ed5435286dd32353c61b1dcc (diff) | |
download | openttd-352e528cdab81f1903f13260dedb34d1b113b6e8.tar.xz |
(svn r27167) -Fix: [SDL, Windows] Right-mouse-button scrolling scrolled/jumped way to far, when OpenTTD lagged during mouse event processing.
Diffstat (limited to 'src/video/win32_v.cpp')
-rw-r--r-- | src/video/win32_v.cpp | 24 |
1 files changed, 5 insertions, 19 deletions
diff --git a/src/video/win32_v.cpp b/src/video/win32_v.cpp index 6e7d33b9f..4dcc9eb70 100644 --- a/src/video/win32_v.cpp +++ b/src/video/win32_v.cpp @@ -747,25 +747,11 @@ static LRESULT CALLBACK WndProcGdi(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lP SetTimer(hwnd, TID_POLLMOUSE, MOUSE_POLL_DELAY, (TIMERPROC)TrackMouseTimerProc); } - if (_cursor.fix_at) { - int dx = x - _cursor.pos.x; - int dy = y - _cursor.pos.y; - if (dx != 0 || dy != 0) { - _cursor.delta.x = dx; - _cursor.delta.y = dy; - - pt.x = _cursor.pos.x; - pt.y = _cursor.pos.y; - - ClientToScreen(hwnd, &pt); - SetCursorPos(pt.x, pt.y); - } - } else { - _cursor.delta.x = x - _cursor.pos.x; - _cursor.delta.y = y - _cursor.pos.y; - _cursor.pos.x = x; - _cursor.pos.y = y; - _cursor.dirty = true; + if (_cursor.UpdateCursorPosition(x, y, true)) { + pt.x = _cursor.pos.x; + pt.y = _cursor.pos.y; + ClientToScreen(hwnd, &pt); + SetCursorPos(pt.x, pt.y); } MyShowCursor(false); HandleMouseEvents(); |