[Scummvm-cvs-logs] SF.net SVN: scummvm:[39822] scummvm/trunk/engines/cruise

[dreammaster at users.sourceforge.net]

Revision: 39822
          http://scummvm.svn.sourceforge.net/scummvm/?rev=39822&view=rev
Author:   dreammaster
Date:     2009-04-03 23:27:38 +0000 (Fri, 03 Apr 2009)

Log Message:
-----------
Fixed incorrect palette range usage so room fade-ins happen correctly

Modified Paths:
--------------
    scummvm/trunk/engines/cruise/function.cpp
    scummvm/trunk/engines/cruise/gfxModule.cpp
    scummvm/trunk/engines/cruise/gfxModule.h

Modified: scummvm/trunk/engines/cruise/function.cpp
===================================================================
--- scummvm/trunk/engines/cruise/function.cpp	2009-04-03 23:06:42 UTC (rev 39821)
+++ scummvm/trunk/engines/cruise/function.cpp	2009-04-03 23:27:38 UTC (rev 39822)
@@ -915,7 +915,7 @@
 		}
 	}
 
-	gfxModuleData_setPal256(workpal);
+	gfxModuleData_setPalEntries(workpal, 0, 32);
 
 	return 0;
 }

Modified: scummvm/trunk/engines/cruise/gfxModule.cpp
===================================================================
--- scummvm/trunk/engines/cruise/gfxModule.cpp	2009-04-03 23:06:42 UTC (rev 39821)
+++ scummvm/trunk/engines/cruise/gfxModule.cpp	2009-04-03 23:27:38 UTC (rev 39822)
@@ -117,13 +117,10 @@
 	gfxModuleData_setDirtyColors(idx, idx);
 }
 
-void gfxModuleData_setPal256(uint8 *ptr) {
-	int R;
-	int G;
-	int B;
-	int i;
+void gfxModuleData_setPalEntries(const byte *ptr, int start, int num) {
+	int R, G, B, i;
 
-	for (i = 0; i < 256; i++) {
+	for (i = start; i < start + num; i++) {
 		R = *(ptr++);
 		G = *(ptr++);
 		B = *(ptr++);
@@ -134,9 +131,13 @@
 		lpalette[i].A = 255;
 	}
 
-	gfxModuleData_setDirtyColors(0, 255);
+	gfxModuleData_setDirtyColors(start, start + num - 1);
 }
 
+void gfxModuleData_setPal256(const byte *ptr) {
+	gfxModuleData_setPalEntries(ptr, 0, 256);
+}
+
 /*void gfxModuleData_setPal(uint8 *ptr) {
 	int i;
 	int R;

Modified: scummvm/trunk/engines/cruise/gfxModule.h
===================================================================
--- scummvm/trunk/engines/cruise/gfxModule.h	2009-04-03 23:06:42 UTC (rev 39821)
+++ scummvm/trunk/engines/cruise/gfxModule.h	2009-04-03 23:27:38 UTC (rev 39822)
@@ -59,7 +59,8 @@
 void gfxModuleData_flipScreen(void);
 //void gfxModuleData_setPal(uint8 * ptr);
 void gfxModuleData_convertOldPalColor(uint16 oldColor, uint8 *pOutput);
-void gfxModuleData_setPal256(uint8 *ptr);
+void gfxModuleData_setPalEntries(const byte *ptr, int start, int num);
+void gfxModuleData_setPal256(const byte *ptr);
 void flip(void);
 void drawSolidBox(int32 x1, int32 y1, int32 x2, int32 y2, uint8 colour);
 void resetBitmap(uint8 *dataPtr, int32 dataSize);


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