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

[dreammaster at users.sourceforge.net]

Revision: 29068
          http://scummvm.svn.sourceforge.net/scummvm/?rev=29068&view=rev
Author:   dreammaster
Date:     2007-09-23 15:12:37 -0700 (Sun, 23 Sep 2007)

Log Message:
-----------
Tweaked the colour fading code so that room 4 will display correctly

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

Modified: scummvm/trunk/engines/lure/room.cpp
===================================================================
--- scummvm/trunk/engines/lure/room.cpp	2007-09-23 22:11:14 UTC (rev 29067)
+++ scummvm/trunk/engines/lure/room.cpp	2007-09-23 22:12:37 UTC (rev 29068)
@@ -512,7 +512,7 @@
 	}
 
 	_screen.empty();
-	_screen.setPaletteEmpty(GAME_COLOURS);
+	_screen.setPaletteEmpty(RES_PALETTE_ENTRIES);
 
 	_numLayers = _roomData->numLayers;
 	if (showOverlay) ++_numLayers;
@@ -521,11 +521,12 @@
 	for (uint8 layerNum = 0; layerNum < _numLayers; ++layerNum) 
 		_layers[layerNum] = new RoomLayer(_roomData->layers[layerNum],
 			layerNum == 0);
-
+/*
 	// Load in the game palette, which contains at it's top end general GUI element colours
 	Palette mainPalette(GAME_PALETTE_RESOURCE_ID);
-	_screen.setPalette(&mainPalette, 0, GAME_COLOURS);
-
+	_screen.setPalette(&mainPalette, RES_PALETTE_ENTRIES, 
+		GAME_COLOURS - RES_PALETTE_ENTRIES);
+*/
 	// Generate the palette for the room that will be faded in
 	Palette p(MAIN_PALETTE_SIZE, NULL, RGB64);
 	Palette tempPalette(paletteId);


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