[Scummvm-cvs-logs] CVS: scummvm/scumm costume.cpp,1.100,1.101

[Travis Howell]

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

Modified Files:
	costume.cpp 
Log Message:

Use correct costume color for darkness in v1 zak


Index: costume.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/costume.cpp,v
retrieving revision 1.100
retrieving revision 1.101
diff -u -d -r1.100 -r1.101
--- costume.cpp	18 Aug 2003 02:16:48 -0000	1.100
+++ costume.cpp	18 Aug 2003 06:59:18 -0000	1.101
@@ -342,13 +342,19 @@
 	// TODO:
 	// * test masking (once we implement any masking for V1 games)
 
-	byte palette[4] = { 0, 8, 0, 0 };
+	byte palette[4] = { 0, 0, 0, 0 };
 
 	if (_vm->_gameId == GID_MANIAC) {
 		palette[1] = v1_mm_actor_palatte_1[actor];
 		palette[2] = v1_mm_actor_palatte_2[actor];
 	} else {
-		palette[2] = _palette[0];
+		if (!(_vm->VAR(_vm->VAR_CURRENT_LIGHTS) & LIGHTMODE_actor_color)) {
+			palette[2] = 11;
+			palette[3] = 11;
+		} else {
+			palette[1] = 8;
+			palette[2] = _palette[0];
+		}
 	}
 
 	v1.skip_width >>= 3;
@@ -728,7 +734,8 @@
 	byte color;
 
 	if (_loaded._format == 0x57) {
-		_palette[0] = palette[0];
+			_palette[0] = palette[0];
+
 		return;
 	}