[Scummvm-cvs-logs] CVS: scummvm/scumm script_v2.cpp,2.177,2.178

Travis Howell kirben at users.sourceforge.net
Mon Aug 18 21:35:08 CEST 2003


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

Modified Files:
	script_v2.cpp 
Log Message:

Fix for v1 maniac demo mode not setting text color before displaying text


Index: script_v2.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v2.cpp,v
retrieving revision 2.177
retrieving revision 2.178
diff -u -d -r2.177 -r2.178
--- script_v2.cpp	19 Aug 2003 04:15:14 -0000	2.177
+++ script_v2.cpp	19 Aug 2003 04:34:41 -0000	2.178
@@ -416,8 +416,13 @@
 	_string[textSlot].overhead = false;
 
 	// V1 Mansion Mansion uses static color table for subtitles
-	if (((_gameId == GID_MANIAC) && (_version == 1)) && _actorToPrintStrFor != 0xFF) 
-		_string[textSlot].color =  v1_mm_actor_speech_color[_actorToPrintStrFor];
+	if ((_gameId == GID_MANIAC) && (_version == 1)) {
+		// Demo mode doesn't set subtitle color before display first subtitle.
+		if (_demo_mode && _actorToPrintStrFor == 0xFF)
+			_string[textSlot].color = 1;
+		else if (_actorToPrintStrFor != 0xFF) 
+			_string[textSlot].color =  v1_mm_actor_speech_color[_actorToPrintStrFor];
+	}
 
 	_messagePtr = buffer;
 	switch (textSlot) {





More information about the Scummvm-git-logs mailing list