From 66311e32484d5fd5e18766125c4f09ed0604314f Mon Sep 17 00:00:00 2001
From: Travis Howell
Date: Tue, 21 Jul 2009 10:37:58 +0000
Subject: Fix fade effects in Waxworks.

svn-id: r42638
---
 engines/agos/vga_ww.cpp | 22 ++++------------------
 1 file changed, 4 insertions(+), 18 deletions(-)

(limited to 'engines/agos/vga_ww.cpp')

diff --git a/engines/agos/vga_ww.cpp b/engines/agos/vga_ww.cpp
index e7f2ad7807..afc05f7869 100644
--- a/engines/agos/vga_ww.cpp
+++ b/engines/agos/vga_ww.cpp
@@ -193,20 +193,8 @@ void AGOSEngine::vc61() {
 
 	_system->unlockScreen();
 
-	if (a == 6) {
-		//fullFade();
-		src = _curVgaFile2 + 32;
-
-		uint8 palette[1024];
-		for (int i = 0; i < 256; i++) {
-			palette[i * 4 + 0] = *src++ * 4;
-			palette[i * 4 + 1] = *src++ * 4;
-			palette[i * 4 + 2] = *src++ * 4;
-			palette[i * 4 + 3] = 0;
-		}
-
-		_system->setPalette(palette, 0, 256);
-	}
+	if (a == 6)
+		fullFade();
 }
 
 void AGOSEngine::vc62_fastFadeOut() {
@@ -221,8 +209,6 @@ void AGOSEngine::vc62_fastFadeOut() {
 				_fastFadeCount = 208;
 		}
 
-		memcpy(_videoBuf1, _currentPalette, _fastFadeCount * 4);
-
 		if (getGameType() == GType_FF || getGameType() == GType_PP) {
 			if (getGameType() == GType_FF && getBitFlag(75)) {
 				fadeCount = 4;
@@ -237,8 +223,8 @@ void AGOSEngine::vc62_fastFadeOut() {
 		}
 
 		for (i = fadeCount; i != 0; --i) {
-			paletteFadeOut(_videoBuf1, _fastFadeCount, fadeSize);
-			_system->setPalette(_videoBuf1, 0, _fastFadeCount);
+			paletteFadeOut(_currentPalette, _fastFadeCount, fadeSize);
+			_system->setPalette(_currentPalette, 0, _fastFadeCount);
 			delay(5);
 		}
 
-- 
cgit v1.2.3