VOYEUR: Some fixes for startup palette loading

3 files changed, 6 insertions, 5 deletions

diff --git a/engines/voyeur/events.cpp b/engines/voyeur/events.cpp
index 29959a8fae..02b0f7f738 100644
--- a/engines/voyeur/events.cpp
+++ b/engines/voyeur/events.cpp
@@ -159,7 +159,7 @@ void EventsManager::startFade(CMapResource *cMap) {
 	_fadeCount = cMap->_steps + 1;
 
 	if (cMap->_steps > 0) {
-		_vm->_graphicsManager._fadeStatus = cMap->_fadeStatus;
+		_vm->_graphicsManager._fadeStatus = cMap->_fadeStatus | 1;
 		uint16 *destP = (uint16 *)(_vm->_graphicsManager._viewPortListPtr->_palette +
 			(_fadeFirstCol * 16));
 		byte *vgaP = &_vm->_graphicsManager._VGAColors[_fadeFirstCol * 3];
diff --git a/engines/voyeur/graphics.cpp b/engines/voyeur/graphics.cpp
index 7a6780085c..36184dbd76 100644
--- a/engines/voyeur/graphics.cpp
+++ b/engines/voyeur/graphics.cpp
@@ -77,7 +77,7 @@ void GraphicsManager::fadeIntFunc() {
 }
 
 void GraphicsManager::vDoFadeInt() {
-	// TODO: more
+	
 }
 
 void GraphicsManager::vDoCycleInt() {
diff --git a/engines/voyeur/voyeur.cpp b/engines/voyeur/voyeur.cpp
index 325d696dd9..aa48ebdd8a 100644
--- a/engines/voyeur/voyeur.cpp
+++ b/engines/voyeur/voyeur.cpp
@@ -152,17 +152,19 @@ void VoyeurEngine::doHeadTitle() {
 		_graphicsManager.flipPage();
 		_eventsManager.sWaitFlip();
 
-		// Immediate fade in to show the initial screen
+		// Immediate palette load to show the initial screen
 		CMapResource *cMap = _bVoy->getCMapResource(0x5030000);
 		assert(cMap);
 		cMap->_steps = 0;
 		cMap->startFade();
 
+		// Wait briefly
 		_eventsManager.delay(150);
 		if (shouldQuit())
 			return;
-		/* Commented out until fade in is working
+
 		// Fade out the screen
+		cMap = _bVoy->getCMapResource(0x5040000);
 		cMap->_steps = 30;
 		cMap->startFade();
 		if (shouldQuit())
@@ -181,7 +183,6 @@ void VoyeurEngine::doHeadTitle() {
 
 		if (shouldQuit())
 			return;
-		*/
 	}
 }