[Scummvm-cvs-logs] CVS: scummvm/scumm intern.h,2.464,2.465 palette.cpp,2.40,2.41 scumm.h,1.601,1.602

[Max Horn]

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

Modified Files:
	intern.h palette.cpp scumm.h 
Log Message:
desaturatePalette is V8 specific

Index: intern.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/intern.h,v
retrieving revision 2.464
retrieving revision 2.465
diff -u -d -r2.464 -r2.465
--- intern.h	26 Apr 2005 15:13:02 -0000	2.464
+++ intern.h	26 Apr 2005 15:42:34 -0000	2.465
@@ -1307,6 +1307,10 @@
 
 	virtual int getObjectIdFromOBIM(const byte *obim);
 
+
+	void desaturatePalette(int hueScale, int satScale, int lightScale, int startColor, int endColor);
+
+
 	/* Version 8 script opcodes */
 	void o8_mod();
 	void o8_wait();

Index: palette.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/palette.cpp,v
retrieving revision 2.40
retrieving revision 2.41
diff -u -d -r2.40 -r2.41
--- palette.cpp	26 Apr 2005 14:24:29 -0000	2.40
+++ palette.cpp	26 Apr 2005 15:42:35 -0000	2.41
@@ -706,7 +706,7 @@
  * components of the palette colors. It's used in CMI when Guybrush
  * walks from the beach towards the swamp.
  */
-void ScummEngine::desaturatePalette(int hueScale, int satScale, int lightScale, int startColor, int endColor) {
+void ScummEngine_v8::desaturatePalette(int hueScale, int satScale, int lightScale, int startColor, int endColor) {
 
 	if (startColor <= endColor) {
 		const byte *cptr;
@@ -925,8 +925,8 @@
 		cptr += _CLUT_offs;
 	} else {
 		cptr = findPalInPals(cptr + _PALS_offs, palindex);
+		assert(cptr);
 	}
-	assert(cptr);
 	return cptr;
 }
 

Index: scumm.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/scumm.h,v
retrieving revision 1.601
retrieving revision 1.602
diff -u -d -r1.601 -r1.602
--- scumm.h	26 Apr 2005 13:33:17 -0000	1.601
+++ scumm.h	26 Apr 2005 15:42:35 -0000	1.602
@@ -973,7 +973,6 @@
 	void setupShadowPalette(int slot, int redScale, int greenScale, int blueScale, int startColor, int endColor);
 	void setupShadowPalette(int redScale, int greenScale, int blueScale, int startColor, int endColor, int start, int end);
 	virtual void darkenPalette(int redScale, int greenScale, int blueScale, int startColor, int endColor);
-	void desaturatePalette(int hueScale, int satScale, int lightScale, int startColor, int endColor);
 
 	void setupCursor();