[Scummvm-cvs-logs] CVS: scummvm script_v1.cpp,1.120,1.121

[Max Horn]

Update of /cvsroot/scummvm/scummvm
In directory usw-pr-cvs1:/tmp/cvs-serv26036

Modified Files:
	script_v1.cpp 
Log Message:
fixed palette bug (visible in MonkeyVGA in the forest on Melee Island); added some code that might or might not be right for o5_actorset:15

Index: script_v1.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/script_v1.cpp,v
retrieving revision 1.120
retrieving revision 1.121
diff -u -d -r1.120 -r1.121
--- script_v1.cpp	13 Jul 2002 14:07:36 -0000	1.120
+++ script_v1.cpp	13 Jul 2002 15:59:11 -0000	1.121
@@ -774,6 +774,17 @@
 			break;
 		case 15:										/* unk */
 			error("o5_actorset:unk not implemented");
+#if 0
+			int16 args[16] =
+				{
+					0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
+					0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
+				};
+			getWordVararg(args);
+			for (i = 0; i < 16; i++)
+				if (args[i] != 0xFF)
+					a->palette[i] = args[i] /* & 0x0F */;
+#endif
 			break;
 		case 16:										/* width */
 			a->width = getVarOrDirectByte(0x80);
@@ -1920,7 +1931,7 @@
 				b = getVarOrDirectWord(0x40);
 			}
 			checkRange(256, 0, a, "o5_roomOps: 2: Illegal room color slot (%d)");
-			_currentPalette[a] = b;		/*FIXME: should be shadow palette */
+			_shadowPalette[a] = b;
 			//        _fullRedraw = 1;
 		} else {
 			a = getVarOrDirectWord(0x80);