From 816381bbfed1b8d8a3305506d5e007e7fc0969c2 Mon Sep 17 00:00:00 2001
From: Filippos Karapetis
Date: Thu, 14 Jan 2016 01:31:27 +0200
Subject: LAB: Move frame waiting outside setAmigaPal()

---
 engines/lab/dispman.cpp | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

(limited to 'engines/lab/dispman.cpp')

diff --git a/engines/lab/dispman.cpp b/engines/lab/dispman.cpp
index 8be1772826..e4bef24f5f 100644
--- a/engines/lab/dispman.cpp
+++ b/engines/lab/dispman.cpp
@@ -437,7 +437,6 @@ void DisplayMan::setAmigaPal(uint16 *pal) {
 	}
 
 	writeColorRegs(vgaPal, 0, 16);
-	_vm->waitTOF();
 }
 
 void DisplayMan::writeColorRegs(byte *buf, uint16 first, uint16 numReg) {
@@ -933,18 +932,21 @@ void DisplayMan::fade(bool fadeIn) {
 	for (int i = 0; i < 16; i++) {
 		for (int palIdx = 0; palIdx < 16; palIdx++) {
 			if (fadeIn)
-				newPal[palIdx] = (0x00F & fadeNumIn(0x00F & _fadePalette[palIdx], 0, i)) +
-				(0x0F0 & fadeNumIn(0x0F0 & _fadePalette[palIdx], 0, i)) +
-				(0xF00 & fadeNumIn(0xF00 & _fadePalette[palIdx], 0, i));
+				newPal[palIdx] =
+					(0x00F & fadeNumIn(0x00F & _fadePalette[palIdx], 0, i)) +
+					(0x0F0 & fadeNumIn(0x0F0 & _fadePalette[palIdx], 0, i)) +
+					(0xF00 & fadeNumIn(0xF00 & _fadePalette[palIdx], 0, i));
 			else
-				newPal[palIdx] = (0x00F & fadeNumOut(0x00F & _fadePalette[palIdx], 0, i)) +
-				(0x0F0 & fadeNumOut(0x0F0 & _fadePalette[palIdx], 0, i)) +
-				(0xF00 & fadeNumOut(0xF00 & _fadePalette[palIdx], 0, i));
+				newPal[palIdx] =
+					(0x00F & fadeNumOut(0x00F & _fadePalette[palIdx], 0, i)) +
+					(0x0F0 & fadeNumOut(0x0F0 & _fadePalette[palIdx], 0, i)) +
+					(0xF00 & fadeNumOut(0xF00 & _fadePalette[palIdx], 0, i));
 		}
 
 		setAmigaPal(newPal);
-		_vm->waitTOF();
 		_vm->updateEvents();
+		_vm->waitTOF();
+		_vm->waitTOF();
 	}
 }
 
-- 
cgit v1.2.3