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

[dreammaster at users.sourceforge.net]

Revision: 30236
          http://scummvm.svn.sourceforge.net/scummvm/?rev=30236&view=rev
Author:   dreammaster
Date:     2008-01-05 04:09:24 -0800 (Sat, 05 Jan 2008)

Log Message:
-----------
Changed room change code for an immediate transition when in EGA mode (which can't do fades)

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

Modified: scummvm/trunk/engines/lure/room.cpp
===================================================================
--- scummvm/trunk/engines/lure/room.cpp	2008-01-05 11:44:24 UTC (rev 30235)
+++ scummvm/trunk/engines/lure/room.cpp	2008-01-05 12:09:24 UTC (rev 30236)
@@ -559,9 +559,12 @@
 	_descId = _roomData->descId;
 
 	if (fadeFlag) {
-		// 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);
+		if (isEGA)
+			_screen.setPaletteEmpty();
+		else
+			// 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);
 
 		// Deallocate graphical layers from the room
 		for (int layerNum = 0; layerNum < _numLayers; ++layerNum) {
@@ -628,7 +631,7 @@
 	update();
 	_screen.update();
 
-	if (fadeFlag)
+	if (fadeFlag && !isEGA)
 		_screen.paletteFadeIn(p);
 	else
 		_screen.setPalette(p);


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