Archives/OpenTTD-patches
2
0
Fork 0
mirror of https://github.com/JGRennison/OpenTTD-patches.git synced 2024-11-17 21:25:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

(svn r18790) -Revert (r18001,r18177,FS#3515): Viewport could still jump under high CPU load. Revert as change caused more problems than it fixed.

Browse Source
This commit is contained in:
peter1138 2010-01-12 09:54:18 +00:00
parent f544df0a2d
commit 694470e325
1 changed files with 3 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/video/sdl_v.cpp
View File

@ -29,8 +29,6 @@ static FVideoDriver_SDL iFVideoDriver_SDL;
static SDL_Surface *_sdl_screen;
static bool _all_modes;
/** Flag used to determine if _cursor.fix_at has changed. */
static bool _last_fix_at;
/** Whether the drawing is/may be done in a separate thread. */
static bool _draw_threaded;
@ -374,22 +372,12 @@ static int PollEvent()
switch (ev.type) {
case SDL_MOUSEMOTION:
if (_cursor.fix_at) {
int dx;
int dy;
if (_last_fix_at) {
dx = ev.motion.x - _screen.width / 2;
dy = ev.motion.y - _screen.height / 2;
} else {
/* Mouse hasn't been warped yet, so our movement is
* relative to the old position. */
dx = ev.motion.x - _cursor.pos.x;
dy = ev.motion.y - _cursor.pos.y;
_last_fix_at = true;
}
int dx = ev.motion.x - _cursor.pos.x;
int dy = ev.motion.y - _cursor.pos.y;
if (dx != 0 || dy != 0) {
_cursor.delta.x = dx;
_cursor.delta.y = dy;
SDL_CALL SDL_WarpMouse(_screen.width / 2, _screen.height / 2);
SDL_CALL SDL_WarpMouse(_cursor.pos.x, _cursor.pos.y);
}
} else {
_cursor.delta.x = ev.motion.x - _cursor.pos.x;
@ -436,13 +424,6 @@ static int PollEvent()
_right_button_down = false;
}
HandleMouseEvents();
if (_cursor.fix_at != _last_fix_at) {
/* Mouse fixing changed during a mouse button up event, so it
* must have been released. */
_last_fix_at = false;
SDL_CALL SDL_WarpMouse(_cursor.pos.x, _cursor.pos.y);
}
break;
case SDL_ACTIVEEVENT: