Call updateScreen() from waitForTimer() (instead of usually right before it)

for smoother mouse cursor movement.

svn-id: r21993

2 files changed, 1 insertions, 8 deletions

diff --git a/engines/scumm/gfx.cpp b/engines/scumm/gfx.cpp
index 018895d546..46255ef245 100644
--- a/engines/scumm/gfx.cpp
+++ b/engines/scumm/gfx.cpp
@@ -3115,7 +3115,6 @@ void ScummEngine::transitionEffect(int a) {
 
 		// Draw the current state to the screen and wait half a sec so the user
 		// can watch the effect taking place.
-		_system->updateScreen();
 		waitForTimer(30);
 	}
 }
@@ -3225,7 +3224,6 @@ void ScummEngine::dissolveEffect(int width, int height) {
 
 		if (++blits >= blits_before_refresh) {
 			blits = 0;
-			_system->updateScreen();
 			waitForTimer(30);
 		}
 	}
@@ -3233,7 +3231,6 @@ void ScummEngine::dissolveEffect(int width, int height) {
 	free(offsets);
 
 	if (blits != 0) {
-		_system->updateScreen();
 		waitForTimer(30);
 	}
 }
@@ -3271,7 +3268,6 @@ void ScummEngine::scrollEffect(int dir) {
 					vs->pitch,
 					0, 0,
 					vs->w, vs->h - y);
-			_system->updateScreen();
 			waitForTimer(kPictureDelay);
 
 			y += step;
@@ -3290,7 +3286,6 @@ void ScummEngine::scrollEffect(int dir) {
 					vs->pitch,
 					0, y,
 					vs->w, vs->h - y);
-			_system->updateScreen();
 			waitForTimer(kPictureDelay);
 
 			y += step;
@@ -3309,7 +3304,6 @@ void ScummEngine::scrollEffect(int dir) {
 					vs->pitch,
 					0, 0,
 					vs->w - x, vs->h);
-			_system->updateScreen();
 			waitForTimer(kPictureDelay);
 
 			x += step;
@@ -3328,7 +3322,6 @@ void ScummEngine::scrollEffect(int dir) {
 					vs->pitch,
 					x, 0,
 					vs->w - x, vs->h);
-			_system->updateScreen();
 			waitForTimer(kPictureDelay);
 
 			x += step;
diff --git a/engines/scumm/scumm.cpp b/engines/scumm/scumm.cpp
index 6466f6e404..931aa00d58 100644
--- a/engines/scumm/scumm.cpp
+++ b/engines/scumm/scumm.cpp
@@ -1472,7 +1472,6 @@ int ScummEngine::go() {
 	while (!_quit) {
 
 		updatePalette();
-		_system->updateScreen();
 
 		diff -= _system->getMillis();
 		waitForTimer(delta * 15 + diff);
@@ -1503,6 +1502,7 @@ void ScummEngine::waitForTimer(int msec_delay) {
 	while (!_quit) {
 		_sound->updateCD(); // Loop CD Audio if needed
 		parseEvents();
+		_system->updateScreen();
 		if (_system->getMillis() >= start_time + msec_delay)
 			break;
 		_system->delayMillis(10);