[Scummvm-cvs-logs] CVS: scummvm/scumm actor.cpp,1.153,1.154 costume.cpp,1.107,1.108 script_v2.cpp,2.182,2.183

[Travis Howell]

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

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

v1 zak costume colors should be perfect now


Index: actor.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/actor.cpp,v
retrieving revision 1.153
retrieving revision 1.154
diff -u -d -r1.153 -r1.154
--- actor.cpp	19 Aug 2003 04:36:46 -0000	1.153
+++ actor.cpp	20 Aug 2003 12:04:25 -0000	1.154
@@ -1227,6 +1227,9 @@
 	}
 
 
+	if (_vm->_version == 1)
+		return;
+
 	if (_vm->_features & GF_NEW_COSTUMES) {
 		for (i = 0; i < 256; i++)
 			palette[i] = 0xFF;

Index: costume.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/costume.cpp,v
retrieving revision 1.107
retrieving revision 1.108
diff -u -d -r1.107 -r1.108
--- costume.cpp	20 Aug 2003 11:45:40 -0000	1.107
+++ costume.cpp	20 Aug 2003 12:04:25 -0000	1.108
@@ -743,6 +743,9 @@
 		for (i = 0; i < 14; i++) {
 			_palette[i] = palette[i];
 		}
+		warning("palette[12] is %d", palette[12]);
+		warning("_palette[12] is %d", _palette[12]);
+
 	} else if (_vm->_features & GF_OLD_BUNDLE) {
 		if ((_vm->VAR(_vm->VAR_CURRENT_LIGHTS) & LIGHTMODE_actor_color)) {
 			memcpy(_palette, palette, 16);

Index: script_v2.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v2.cpp,v
retrieving revision 2.182
retrieving revision 2.183
diff -u -d -r2.182 -r2.183