[Scummvm-cvs-logs] CVS: scummvm/scumm costume.cpp,1.106,1.107 script_v2.cpp,2.180,2.181

[Travis Howell]

Update of /cvsroot/scummvm/scummvm/scumm
In directory sc8-pr-cvs1:/tmp/cvs-serv19479/scumm

Modified Files:
	costume.cpp script_v2.cpp 
Log Message:

v1 zak costume color almost all right.


Index: costume.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/costume.cpp,v
retrieving revision 1.106
retrieving revision 1.107
diff -u -d -r1.106 -r1.107
--- costume.cpp	19 Aug 2003 07:29:15 -0000	1.106
+++ costume.cpp	20 Aug 2003 11:45:40 -0000	1.107
@@ -357,7 +357,7 @@
 		palette[2] = v1_mm_actor_palatte_2[actor];
 	} else {
 		palette[1] = 10;
-		palette[2] = _palette[0];
+		palette[2] = _palette[actor];
 	}
 
 	v1.skip_width >>= 3;
@@ -740,11 +740,10 @@
 	byte color;
 
 	if (_loaded._format == 0x57) {
-		_palette[0] = palette[0];
-		return;
-	}
-
-	if (_vm->_features & GF_OLD_BUNDLE) {
+		for (i = 0; i < 14; i++) {
+			_palette[i] = palette[i];
+		}
+	} else if (_vm->_features & GF_OLD_BUNDLE) {
 		if ((_vm->VAR(_vm->VAR_CURRENT_LIGHTS) & LIGHTMODE_actor_color)) {
 			memcpy(_palette, palette, 16);
 		} else {

Index: script_v2.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v2.cpp,v
retrieving revision 2.180
retrieving revision 2.181
diff -u -d -r2.180 -r2.181
--- script_v2.cpp	19 Aug 2003 11:11:11 -0000	2.180
+++ script_v2.cpp	20 Aug 2003 11:45:40 -0000	2.181
@@ -696,12 +696,10 @@
 			break;
 
 		case 2:		// Actor Set Color
-			if (_version == 1) {
-				i = 0;
-			} else {
+			if (_version == 2)
 				i = fetchScriptByte();
-			}
-			a->palette[i] = arg;
+
+			a->palette[act] = arg;
 			a->needRedraw = true;
 			break;