[Scummvm-cvs-logs] SF.net SVN: scummvm: [21108] scummvm/trunk/engines/queen/display.cpp

cyx at users.sourceforge.net cyx at users.sourceforge.net
Sun Mar 5 16:19:55 CET 2006


Revision: 21108
Author:   cyx
Date:     2006-03-05 15:50:24 -0800 (Sun, 05 Mar 2006)
ViewCVS:  http://svn.sourceforge.net/scummvm?rev=21108&view=rev

Log Message:
-----------
fixed palette handling regression, as reported on the forum.

Modified Paths:
--------------
    scummvm/trunk/engines/queen/display.cpp
Modified: scummvm/trunk/engines/queen/display.cpp
===================================================================
--- scummvm/trunk/engines/queen/display.cpp	2006-03-05 22:35:26 UTC (rev 21107)
+++ scummvm/trunk/engines/queen/display.cpp	2006-03-05 23:50:24 UTC (rev 21108)
@@ -155,7 +155,9 @@
 void Display::palSet(const uint8 *pal, int start, int end, bool updateScreen) {
 	debug(9, "Display::palSet(%d, %d)", start, end);
 	const int numColors = end - start + 1;
+	assert(numColors <= 256);
 	uint8 tempPal[256 * 4];
+	pal += start * 3;
 	for (int i = 0; i < numColors; i++) {
 		tempPal[4 * i + 0] = *pal++;
 		tempPal[4 * i + 1] = *pal++;







More information about the Scummvm-git-logs mailing list