Cleanup.

svn-id: r26833

1 files changed, 46 insertions, 42 deletions

diff --git a/engines/agos/event.cpp b/engines/agos/event.cpp
index 01058938c9..b2636d2a48 100644
--- a/engines/agos/event.cpp
+++ b/engines/agos/event.cpp
@@ -440,7 +440,7 @@ void AGOSEngine::delay(uint amount) {
 }
 
 void AGOSEngine::timer_callback() {
-	if (_timer5 != 0) {
+	if (_timer5) {
 		_syncFlag2 = true;
 		_timer5--;
 	} else {
@@ -448,7 +448,7 @@ void AGOSEngine::timer_callback() {
 	}
 }
 
-void AGOSEngine::timer_proc1() {
+void AGOSEngine_Feeble::timer_proc1() {
 	_timer4++;
 
 	if (_lockWord & 0x80E9 || _lockWord & 2)
@@ -458,41 +458,15 @@ void AGOSEngine::timer_proc1() {
 
 	_lockWord |= 2;
 
-	handleMouseMoved();
-
 	if (!(_lockWord & 0x10)) {
-		if (getGameType() == GType_PP) {
-			_syncFlag2 ^= 1;
-			if (!_syncFlag2) {
-				processVgaEvents();
-			} else {
-				if (_scrollCount == 0) {
-					_lockWord &= ~2;
-					return;
-				}
-			}
-		} else if (getGameType() == GType_FF) {
-			_syncFlag2 ^= 1;
-			if (!_syncFlag2) {
-				processVgaEvents();
-			} else {
-				// Double speed on Oracle
-				if (getBitFlag(99)) {
-					processVgaEvents();
-				} else if (_scrollCount == 0) {
-					_lockWord &= ~2;
-					return;
-				}
-			}
-		} else {
-			processVgaEvents();
+		_syncFlag2 ^= 1;
+		if (!_syncFlag2) {
 			processVgaEvents();
-			_syncFlag2 ^= 1;
-			_cepeFlag ^= 1;
-			if (!_cepeFlag)
+		} else {
+			// Double speed on Oracle
+			if (getGameType() == GType_FF && getBitFlag(99)) {
 				processVgaEvents();
-
-			if (_mouseHideCount != 0 && _syncFlag2) {
+			} else if (_scrollCount == 0) {
 				_lockWord &= ~2;
 				return;
 			}
@@ -501,21 +475,15 @@ void AGOSEngine::timer_proc1() {
 
 	if (getGameType() == GType_FF) {
 		_moviePlay->nextFrame();
-		animateSprites();
 	}
 
+	animateSprites();
+
 	if (_copyPartialMode == 2) {
 		fillFrontFromBack(0, 0, _screenWidth, _screenHeight);
 		_copyPartialMode = 0;
 	}
 
-	if (_updateScreen) {
-		_system->copyRectToScreen(getFrontBuf(), _screenWidth, 0, 0, _screenWidth, _screenHeight);
-		_system->updateScreen();
-
-		_updateScreen = false;
-	}
-
 	if (_displayScreen) {
 		if (getGameType() == GType_FF) {
 			if (!getBitFlag(78)) {
@@ -525,6 +493,42 @@ void AGOSEngine::timer_proc1() {
 				swapCharacterLogo();
 			}
 		}
+		handleMouseMoved();
+		displayScreen();
+		_displayScreen = false;
+	}
+
+	_lockWord &= ~2;
+}
+
+void AGOSEngine::timer_proc1() {
+	_timer4++;
+
+	if (_lockWord & 0x80E9 || _lockWord & 2)
+		return;
+
+	_syncCount++;
+
+	_lockWord |= 2;
+
+	handleMouseMoved();
+
+	if (!(_lockWord & 0x10)) {
+		processVgaEvents();
+		processVgaEvents();
+		_cepeFlag ^= 1;
+		if (!_cepeFlag)
+			processVgaEvents();
+	} 
+
+	if (_updateScreen) {
+		_system->copyRectToScreen(getFrontBuf(), _screenWidth, 0, 0, _screenWidth, _screenHeight);
+		_system->updateScreen();
+
+		_updateScreen = false;
+	}
+
+	if (_displayScreen) {
 		displayScreen();
 		_displayScreen = false;
 	}