From 8bc84330596829f129e9c00ca2c1711f73685cb6 Mon Sep 17 00:00:00 2001
From: Nicola Mettifogo
Date: Mon, 21 May 2007 19:09:49 +0000
Subject: Fixed palette fade in intro sequence and palette effect for Dino's
 treatment

svn-id: r26904
---
 engines/parallaction/callables.cpp | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

(limited to 'engines')

diff --git a/engines/parallaction/callables.cpp b/engines/parallaction/callables.cpp
index 4d9b1080c6..ffd7a844e4 100644
--- a/engines/parallaction/callables.cpp
+++ b/engines/parallaction/callables.cpp
@@ -65,11 +65,12 @@ void _c_score(void *parm) {
 }
 
 void _c_fade(void *parm) {
+	
 	_vm->_gfx->setBlackPalette();
 
-	_vm->_gfx->swapBuffers();
-
 	Gfx::Palette pal;
+	memset(pal, 0, sizeof(Gfx::Palette));
+	
 	for (uint16 _di = 0; _di < 64; _di++) {
 		_vm->_gfx->fadePalette(pal);
 		_vm->_gfx->setPalette(pal);
@@ -296,21 +297,24 @@ void _c_endComment(void *param) {
 }
 
 void _c_frankenstein(void *parm) {
+	
 	Gfx::Palette pal0;
+	Gfx::Palette pal1;
 
 	for (uint16 i = 0; i <= BASE_PALETTE_COLORS; i++) {
 		pal0[(i+FIRST_BASE_COLOR)] = _vm->_gfx->_palette[i];
 		pal0[(i+FIRST_BASE_COLOR)*3+1] = 0;
 		pal0[(i+FIRST_BASE_COLOR)*3+2] = 0;
-		pal0[(i+FIRST_EHB_COLOR)*3+1] = 0;
-		pal0[(i+FIRST_EHB_COLOR)*3+2] = 0;
+		
+		pal1[(i+FIRST_BASE_COLOR)*3+1] = 0;
+		pal1[(i+FIRST_BASE_COLOR)*3+2] = 0;
 	}
 
 	for (uint16 _di = 0; _di < 30; _di++) {
 		g_system->delayMillis(20);
 		_vm->_gfx->setPalette(pal0, FIRST_BASE_COLOR, BASE_PALETTE_COLORS);
 		g_system->delayMillis(20);
-		_vm->_gfx->setPalette(pal0, FIRST_EHB_COLOR, EHB_PALETTE_COLORS);
+		_vm->_gfx->setPalette(pal1, FIRST_BASE_COLOR, BASE_PALETTE_COLORS);
 	}
 
 	_vm->_gfx->setPalette(_vm->_gfx->_palette);
-- 
cgit v1.2.3