cpp/openttd-patchpack/source Changeset - r14229:8232899184e4

Changeset - r14229:8232899184e4

Parent rev.

Child rev.

[Not reviewed]

master

0 1 0

peter1138 - 14 years ago 2010-01-12 09:54:18
peter1138@openttd.org

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

1 file changed with 3 insertions and 22 deletions:

src/video/sdl_v.cpp

0 comments (0 inline, 0 general)

src/video/sdl_v.cpp

➞

Show inline comments

@@ @@ -29,8 +29,6 @@ static FVideoDriver_SDL iFVideoDriver_SD @@
 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:

0 comments (0 inline, 0 general)