[Scummvm-cvs-logs] CVS: scummvm/scumm script_v2.cpp,2.230,2.230.2.1 scummvm.cpp,2.577.2.3,2.577.2.4

[Travis Howell]

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

Modified Files:
      Tag: branch-0-6-0
	script_v2.cpp scummvm.cpp 
Log Message:

djustments for Enchanced Maniac Mansion demo.


Index: script_v2.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v2.cpp,v
retrieving revision 2.230
retrieving revision 2.230.2.1
diff -u -d -r2.230 -r2.230.2.1
--- script_v2.cpp	15 Jan 2004 19:25:17 -0000	2.230
+++ script_v2.cpp	3 Mar 2004 03:13:47 -0000	2.230.2.1
@@ -419,12 +419,12 @@
 	_string[textSlot].center = false;
 	_string[textSlot].overhead = false;
 
-	// 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 (_gameId == GID_MANIAC) {
+		// Demos don't set subtitle color before display first subtitle.
 		if (_demoMode && _actorToPrintStrFor == 0xFF)
-			_string[textSlot].color = 1;
-		else if (_actorToPrintStrFor != 0xFF) 
+			_string[textSlot].color = (_version == 2) ? 15 : 1;
+		// V1 Mansion Mansion uses dynamic color table for subtitles
+		else if (_version == 1 && _actorToPrintStrFor != 0xFF) 
 			_string[textSlot].color = v1_mm_actor_speech_color[_actorToPrintStrFor];
 	}
 
@@ -823,15 +823,11 @@
 		vs = &_verbs[slot];
 		vs->verbid = verb;
 		if (_version == 1) {
-			if (_gameId == GID_MANIAC && _demoMode)
-				vs->color = 16;
-			else
-				vs->color = 5;
-
+			vs->color = (_gameId == GID_MANIAC && _demoMode) ? 16: 5;
 			vs->hicolor = 7;
 			vs->dimcolor = 11;
 		} else {
-			vs->color = 2;
+			vs->color = (_gameId == GID_MANIAC && _demoMode) ? 13 : 2;
 			vs->hicolor = 14;
 			vs->dimcolor = 8;
 		}
@@ -1382,7 +1378,7 @@
 	// FIXME allows quotes script (173) to start during introudction of
 	// demo mode of V1 Maniac Mansion. setUserState was halting script
 	// 173 before it started.
-	if (!(_gameId == GID_MANIAC && _version == 1 && _demoMode))
+	if (!(_gameId == GID_MANIAC && _demoMode))
 	// Hide inventory, freeze scripts, hide cursor
 	setUserState(15);
 

Index: scummvm.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/scummvm.cpp,v
retrieving revision 2.577.2.3
retrieving revision 2.577.2.4
diff -u -d -r2.577.2.3 -r2.577.2.4
--- scummvm.cpp	24 Feb 2004 11:00:49 -0000	2.577.2.3
+++ scummvm.cpp	3 Mar 2004 03:13:47 -0000	2.577.2.4
@@ -1024,7 +1024,7 @@
 		_actors[i].initActor(1);
 	
 		// this is from IDB
-		if (_version == 1)
+		if ((_version == 1) || (_gameId == GID_MANIAC && _demoMode))
 			_actors[i].setActorCostume(i);
 	}