[Scummvm-cvs-logs] CVS: scummvm/scumm palette.cpp,2.29,2.30

Max Horn fingolfin at users.sourceforge.net
Thu Mar 31 15:05:46 CEST 2005


Update of /cvsroot/scummvm/scummvm/scumm
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16626

Modified Files:
	palette.cpp 
Log Message:
Fix GF_OLD256 palette size (no idea if that has an effect anywhere)

Index: palette.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/palette.cpp,v
retrieving revision 2.29
retrieving revision 2.30
diff -u -d -r2.29 -r2.30
--- palette.cpp	24 Mar 2005 03:22:23 -0000	2.29
+++ palette.cpp	31 Mar 2005 23:04:46 -0000	2.30
@@ -209,11 +209,12 @@
 
 	if (numcolor < 0) {
 		if (_features & GF_SMALL_HEADER) {
+			ptr += _resourceHeaderSize;
 			if (_features & GF_OLD256)
-				numcolor = 256;
+				numcolor = READ_LE_UINT16(ptr);
 			else
-				numcolor = READ_LE_UINT16(ptr + 6) / 3;
-			ptr += 8;
+				numcolor = READ_LE_UINT16(ptr) / 3;
+			ptr += 2;
 		} else {
 			numcolor = getResourceDataSize(ptr) / 3;
 		}





More information about the Scummvm-git-logs mailing list