[Scummvm-cvs-logs] CVS: scummvm/scumm script_v2.cpp,2.236,2.237 scummvm.cpp,2.612,2.613

[Travis Howell]

Update of /cvsroot/scummvm/scummvm/scumm
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7235/scumm

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

Adjustments for Enchanced Maniac Mansion demo.


Index: script_v2.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v2.cpp,v
retrieving revision 2.236
retrieving revision 2.237
diff -u -d -r2.236 -r2.237
--- script_v2.cpp	3 Mar 2004 02:42:51 -0000	2.236
+++ script_v2.cpp	3 Mar 2004 02:53:12 -0000	2.237
@@ -419,14 +419,13 @@
 	_string[textSlot].center = false;
 	_string[textSlot].overhead = false;
 
+	// Demo mode doesn't set subtitle color before display first subtitle.
+	if (_demoMode && _actorToPrintStrFor == 0xFF)
+		_string[textSlot].color = (_version == 2) ? 15 : 1;
 	// V1 Mansion Mansion uses dynamic color table for subtitles
-	if ((_gameId == GID_MANIAC) && (_version == 1)) {
-		// Demo mode doesn't set subtitle color before display first subtitle.
-		if (_demoMode && _actorToPrintStrFor == 0xFF)
-			_string[textSlot].color = 1;
-		else if (_actorToPrintStrFor != 0xFF) 
-			_string[textSlot].color = v1_mm_actor_speech_color[_actorToPrintStrFor];
-	}
+	else if ((_gameId == GID_MANIAC) && (_version == 1) && (_actorToPrintStrFor != 0xFF)) 
+		_string[textSlot].color = v1_mm_actor_speech_color[_actorToPrintStrFor];
+
 
 	_messagePtr = buffer;
 	actorTalk();

Index: scummvm.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/scummvm.cpp,v
retrieving revision 2.612
retrieving revision 2.613
diff -u -d -r2.612 -r2.613
--- scummvm.cpp	3 Mar 2004 02:42:51 -0000	2.612
+++ scummvm.cpp	3 Mar 2004 02:53:12 -0000	2.613
@@ -1041,7 +1041,7 @@
 		_actors[i].initActor(1);
 	
 		// this is from IDB
-		if ((_version == 1) || (_version == 2 && _demoMode))
+		if ((_version == 1) || (_gameId == GID_MANIAC && _demoMode))
 			_actors[i].setActorCostume(i);
 	}