[Scummvm-cvs-logs] SF.net SVN: scummvm: [22418] scummvm/trunk/engines/simon/items.cpp

[eriktorbjorn at users.sourceforge.net]

Revision: 22418
Author:   eriktorbjorn
Date:     2006-05-12 13:09:15 -0700 (Fri, 12 May 2006)
ViewCVS:  http://svn.sourceforge.net/scummvm/?rev=22418&view=rev

Log Message:
-----------
Fixed two regressions in the o1_specialFade() opcode: The wrong colours were
faded, and they weren't faded enough. Don't you just love opcodes that are only
ever used at the very end of the game?

Modified Paths:
--------------
    scummvm/trunk/engines/simon/items.cpp
Modified: scummvm/trunk/engines/simon/items.cpp
===================================================================
--- scummvm/trunk/engines/simon/items.cpp	2006-05-12 18:00:41 UTC (rev 22417)
+++ scummvm/trunk/engines/simon/items.cpp	2006-05-12 20:09:15 UTC (rev 22418)
@@ -1622,12 +1622,12 @@
 	// 187: fade to black
 	uint i;
 
-	memcpy(_videoBuf1, _currentPalette, 1024);
+	memcpy(_videoBuf1, _currentPalette, 4 * 256);
 
 	for (i = 32; i != 0; --i) {
-		paletteFadeOut(_videoBuf1, 32, 4);
-		paletteFadeOut(_videoBuf1 + 64, 144, 4);
-		paletteFadeOut(_videoBuf1 + 128, 48, 4);
+		paletteFadeOut(_videoBuf1, 32, 8);
+		paletteFadeOut(_videoBuf1 + 4 * 48, 144, 8);
+		paletteFadeOut(_videoBuf1 + 4 * 208, 48, 8);
 		_system->setPalette(_videoBuf1, 0, 256);
 		delay(5);
 	}


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