[Scummvm-cvs-logs] CVS: scummvm/scumm costume.cpp,1.99,1.100 script_v2.cpp,2.173,2.174

Travis Howell kirben at users.sourceforge.net
Sun Aug 17 19:40:06 CEST 2003


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

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

Fix v1 zak costume colors


Index: costume.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/costume.cpp,v
retrieving revision 1.99
retrieving revision 1.100
diff -u -d -r1.99 -r1.100
--- costume.cpp	17 Aug 2003 16:53:00 -0000	1.99
+++ costume.cpp	18 Aug 2003 02:16:48 -0000	1.100
@@ -321,8 +321,8 @@
 	}
 }
 
-int v1_actor_palatte_1 [] = { 8, 8, 8, 8, 4, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 0 };
-int v1_actor_palatte_2 [] = { 0, 7, 2, 6, 9, 1, 3, 7, 7, 1, 1, 9, 1, 4, 5, 5, 4, 1, 0, 5, 4, 2, 2, 7, 7, 0 };
+int v1_mm_actor_palatte_1 [] = { 8, 8, 8, 8, 4, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 0 };
+int v1_mm_actor_palatte_2 [] = { 0, 7, 2, 6, 9, 1, 3, 7, 7, 1, 1, 9, 1, 4, 5, 5, 4, 1, 0, 5, 4, 2, 2, 7, 7, 0 };
 
 void CostumeRenderer::procC64(int actor) {
 	const byte *src;
@@ -342,12 +342,14 @@
 	// TODO:
 	// * test masking (once we implement any masking for V1 games)
 
-	byte palette[4];
+	byte palette[4] = { 0, 8, 0, 0 };
 
-	palette[0] = 0;
-	palette[1] = v1_actor_palatte_1[actor];
-	palette[2] = v1_actor_palatte_2[actor];
-	palette[3] = 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];
+	}
 
 	v1.skip_width >>= 3;
 
@@ -725,8 +727,10 @@
 	int i;
 	byte color;
 
-	if (_loaded._format == 0x57)
+	if (_loaded._format == 0x57) {
+		_palette[0] = palette[0];
 		return;
+	}
 
 	if (_vm->_features & GF_OLD_BUNDLE) {
 		if ((_vm->VAR(_vm->VAR_CURRENT_LIGHTS) & LIGHTMODE_actor_color)) {

Index: script_v2.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v2.cpp,v
retrieving revision 2.173
retrieving revision 2.174
diff -u -d -r2.173 -r2.174
--- script_v2.cpp	17 Aug 2003 07:02:32 -0000	2.173
+++ script_v2.cpp	18 Aug 2003 02:16:48 -0000	2.174
@@ -372,7 +372,7 @@
 	return readVar(fetchScriptByte());
 }
 
-int actor_speech_color[] = {1, 7, 2, 14, 8, 1, 3, 7, 7, 12, 1, 13, 1, 4, 5, 5, 4, 3, 1, 5, 1, 1, 1, 7, 7, 0};
+int v1_mm_actor_speech_color[] = {1, 7, 2, 14, 8, 1, 3, 7, 7, 12, 1, 13, 1, 4, 5, 5, 4, 3, 1, 5, 1, 1, 1, 7, 7, 0};
 
 void Scumm_v2::decodeParseString() {
 	byte buffer[512];
@@ -417,7 +417,7 @@
 
 	// V1 Mansion Mansion uses static color table for subtitles
 	if (((_gameId == GID_MANIAC) && (_version == 1)) && _actorToPrintStrFor != 0xFF) 
-		_string[textSlot].color =  actor_speech_color[_actorToPrintStrFor];
+		_string[textSlot].color =  v1_mm_actor_speech_color[_actorToPrintStrFor];
 
 	_messagePtr = buffer;
 	switch (textSlot) {
@@ -710,7 +710,7 @@
 
 		case 5:		// Talk Color
 			if ((_gameId == GID_MANIAC) && (_version == 1))
-				actor_speech_color[act] = arg;
+				v1_mm_actor_speech_color[act] = arg;
 			else
 				a->talkColor = arg;
 			break;





More information about the Scummvm-git-logs mailing list