[Scummvm-cvs-logs] SF.net SVN: scummvm: [29277] scummvm/trunk/engines/lure

[dreammaster at users.sourceforge.net]

Revision: 29277
          http://scummvm.svn.sourceforge.net/scummvm/?rev=29277&view=rev
Author:   dreammaster
Date:     2007-10-27 21:27:18 -0700 (Sat, 27 Oct 2007)

Log Message:
-----------
Room fades now correctly fade out any active talk dialog

Modified Paths:
--------------
    scummvm/trunk/engines/lure/room.cpp
    scummvm/trunk/engines/lure/screen.cpp

Modified: scummvm/trunk/engines/lure/room.cpp
===================================================================
--- scummvm/trunk/engines/lure/room.cpp	2007-10-28 04:23:51 UTC (rev 29276)
+++ scummvm/trunk/engines/lure/room.cpp	2007-10-28 04:27:18 UTC (rev 29277)
@@ -498,7 +498,9 @@
 	_descId = _roomData->descId;
 
 	if (leaveFlag) {
-		_screen.paletteFadeOut();
+		// Fade out all the colours except the high index 0FFh, which is used to show the
+		// disk cursor as a room changes
+		_screen.paletteFadeOut(GAME_COLOURS - 1);
 		leaveRoom();
 	}
 
@@ -516,7 +518,8 @@
 	blockMerge();
 
 	// Generate the palette for the room that will be faded in
-	Palette p(MAIN_PALETTE_SIZE, NULL, RGB64);
+	//Palette p(MAIN_PALETTE_SIZE, NULL, RGB64);
+	Palette p(GAME_PALETTE_RESOURCE_ID);
 	Palette tempPalette(paletteId);
 	p.copyFrom(&tempPalette);
 	res.insertPaletteSubset(p);
@@ -543,8 +546,12 @@
 	game.tick();
 	update();
 	_screen.update();
-	_screen.paletteFadeIn(&p);
 
+	if (leaveFlag)
+		_screen.paletteFadeIn(&p);
+	else
+		_screen.setPalette(&p);
+
 	mouse.popCursor();
 }
 

Modified: scummvm/trunk/engines/lure/screen.cpp
===================================================================
--- scummvm/trunk/engines/lure/screen.cpp	2007-10-28 04:23:51 UTC (rev 29276)
+++ scummvm/trunk/engines/lure/screen.cpp	2007-10-28 04:27:18 UTC (rev 29277)
@@ -56,10 +56,15 @@
 // Defaults the palette to an empty set
 
 void Screen::setPaletteEmpty(int numEntries) {
+	Palette emptyPalette(numEntries, NULL, RGB64);
+	_system.setPalette(emptyPalette.data(), 0, numEntries);
+	_palette->copyFrom(&emptyPalette);
+/*
 	delete _palette;
 	_palette = new Palette();
 
 	_system.setPalette(_palette->data(), 0, numEntries);
+*/
 	_system.updateScreen();
 }
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.