[Scummvm-cvs-logs] CVS: scummvm/scumm costume.cpp,1.87,1.88

[Pawel Kolodziejski]

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

Modified Files:
	costume.cpp 
Log Message:
moved up code for v1 setActorPalette func

Index: costume.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/costume.cpp,v
retrieving revision 1.87
retrieving revision 1.88
diff -u -d -r1.87 -r1.88
--- costume.cpp	14 Jul 2003 19:24:34 -0000	1.87
+++ costume.cpp	19 Jul 2003 20:10:40 -0000	1.88
@@ -719,6 +719,9 @@
 	int i;
 	byte color;
 
+	if (_loaded._format == 0x57)
+		return;
+
 	if (_vm->_features & GF_OLD_BUNDLE) {
 		if ((_vm->VAR(_vm->VAR_CURRENT_LIGHTS) & LIGHTMODE_actor_color)) {
 			memcpy(_palette, palette, 16);
@@ -726,8 +729,6 @@
 			memset(_palette, 8, 16);
 			_palette[12] = 0;
 		}
-		if (_loaded._format == 0x57)
-			return;
 		_palette[_loaded._palette[0]] = _palette[0];
 	} else {
 		if ((_vm->_features & GF_NEW_OPCODES) || (_vm->VAR(_vm->VAR_CURRENT_LIGHTS) & LIGHTMODE_actor_color)) {