[Scummvm-cvs-logs] CVS: scummvm/scumm costume.cpp,1.132,1.133 palette.cpp,2.8,2.9 script_v6.cpp,1.361,1.362 scumm.h,1.429,1.430

Travis Howell kirben at users.sourceforge.net
Sun Jul 25 02:23:01 CEST 2004


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

Modified Files:
	costume.cpp palette.cpp script_v6.cpp scumm.h 
Log Message:

Sam & Max doesn't need separate palette, just uses _shadowPalette.


Index: costume.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/costume.cpp,v
retrieving revision 1.132
retrieving revision 1.133
diff -u -d -r1.132 -r1.133
--- costume.cpp	28 Jun 2004 01:09:23 -0000	1.132
+++ costume.cpp	25 Jul 2004 09:21:57 -0000	1.133
@@ -470,11 +470,10 @@
 				masked = (y < 0 || y >= _outheight) || (v1.mask_ptr && ((mask[0] | mask[v1.imgbufoffs]) & maskbit));
 				
 				if (color && !masked) {
-					// FIXME: Fully implement _shadow_mode.
-					// For now, it's enough for Sam & Max
-					// transparency.
+					// FIXME: Fully implement _shadow_mode.in Sam & Max
+					// For now, it's enough for transparency.
 					if (_shadow_mode & 0x20) {
-						pcolor = _vm->_proc_special_palette[*dst];
+						pcolor = _shadow_table[*dst];
 					} else {
 						pcolor = _palette[color];
 						if (pcolor == 13 && _shadow_table)

Index: palette.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/palette.cpp,v
retrieving revision 2.8
retrieving revision 2.9
diff -u -d -r2.8 -r2.9
--- palette.cpp	13 Jul 2004 10:18:06 -0000	2.8
+++ palette.cpp	25 Jul 2004 09:21:57 -0000	2.9
@@ -287,11 +287,6 @@
 
 			doCyclePalette(_currentPalette, cycl->start, cycl->end, 3, !(cycl->flags & 2));
 
-			// Also cycle the other, indirect palettes
-			if (_proc_special_palette) {
-				doCycleIndirectPalette(_proc_special_palette, cycl->start, cycl->end, !(cycl->flags & 2));
-			}
-
 			if (_shadowPalette) {
 				if (_version >= 7) {
 					for (j = 0; j < NUM_SHADOW_PALETTE; j++)
@@ -531,7 +526,7 @@
 }
 
 /** This function create the specialPalette used for semi-transparency in SamnMax */
-void ScummEngine::createSpecialPalette(int16 from, int16 to, int16 redScale, int16 greenScale, int16 blueScale,
+void ScummEngine::setupShadowPalette(int16 from, int16 to, int16 redScale, int16 greenScale, int16 blueScale,
 			int16 startColor, int16 endColor) {
 	const byte *palPtr, *curPtr;
 	const byte *searchPtr;
@@ -546,7 +541,7 @@
 	palPtr = getPalettePtr(_curPalIndex);
 
 	for (i = 0; i < 256; i++)
-		_proc_special_palette[i] = i;
+		_shadowPalette[i] = i;
 
 	curPtr = palPtr + startColor * 3;
 
@@ -574,7 +569,7 @@
 			currentResult = colorWeight(ar - r, ag - g, ab - b);
 
 			if (currentResult < bestResult) {
-				_proc_special_palette[i] = currentIndex;
+				_shadowPalette[i] = currentIndex;
 				bestResult = currentResult;
 			}
 			currentIndex++;

Index: script_v6.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v6.cpp,v
retrieving revision 1.361
retrieving revision 1.362
diff -u -d -r1.361 -r1.362
--- script_v6.cpp	18 Jul 2004 22:29:21 -0000	1.361
+++ script_v6.cpp	25 Jul 2004 09:21:57 -0000	1.362
@@ -2615,7 +2615,7 @@
 			// Case 108 and 109 share the same function
 			if (num != 6)
 				warning("o6_kernelSetFunctions sub op %d: expected 6 params but got %d", args[0], num);
-			createSpecialPalette(args[1], args[2], args[3], args[4], args[5], 0, 256);
+			setupShadowPalette(args[1], args[2], args[3], args[4], args[5], 0, 256);
 			break;
 		case 110:
 			_charset->clearCharsetMask();
@@ -2625,7 +2625,7 @@
 			a->shadow_mode = args[2] + args[3];
 			break;
 		case 112:									/* palette shift? */
-			createSpecialPalette(args[1], args[2], args[3], args[4], args[5], args[6], args[7]);
+			setupShadowPalette(args[1], args[2], args[3], args[4], args[5], args[6], args[7]);
 			break;
 		case 114:
 			// Sam & Max film noir mode

Index: scumm.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/scumm.h,v
retrieving revision 1.429
retrieving revision 1.430
diff -u -d -r1.429 -r1.430
--- scumm.h	24 Jul 2004 11:15:59 -0000	1.429
+++ scumm.h	25 Jul 2004 09:21:58 -0000	1.430
@@ -877,7 +877,7 @@
 	void initBGBuffers(int height);
 	void initCycl(const byte *ptr);	// Color cycle
 
-	void createSpecialPalette(int16 a, int16 b, int16 c, int16 d, int16 e, int16 colorMin, int16 colorMax);
+	void setupShadowPalette(int16 a, int16 b, int16 c, int16 d, int16 e, int16 colorMin, int16 colorMax);
 
 	void drawObject(int obj, int arg);	
 	void drawRoomObjects(int arg);





More information about the Scummvm-git-logs mailing list