[Scummvm-cvs-logs] CVS: scummvm/scumm script_v2.cpp,2.171,2.172

Travis Howell kirben at users.sourceforge.net
Sat Aug 16 03:43:05 CEST 2003


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

Modified Files:
	script_v2.cpp 
Log Message:

color table for actor subtitles in v1 maniac isn't static after all, fixes color issue in demo mode.


Index: script_v2.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v2.cpp,v
retrieving revision 2.171
retrieving revision 2.172
diff -u -d -r2.171 -r2.172
--- script_v2.cpp	16 Aug 2003 08:55:29 -0000	2.171
+++ script_v2.cpp	16 Aug 2003 10:37:26 -0000	2.172
@@ -372,7 +372,7 @@
 	return readVar(fetchScriptByte());
 }
 
-int static 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 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];
@@ -709,7 +709,10 @@
 			break;
 
 		case 5:		// Talk Color
-			a->talkColor = arg;
+			if ((_gameId == GID_MANIAC) && (_version == 1))
+				actor_speech_color[act] = arg;
+			else
+				a->talkColor = arg;
 			break;
 		default:
 			warning("o2_actorSet: opcode %d not yet supported", _opcode);





More information about the Scummvm-git-logs mailing list