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

[Travis Howell]

Update of /cvsroot/scummvm/scummvm/scumm
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5457/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.235
retrieving revision 2.236
diff -u -d -r2.235 -r2.236
--- script_v2.cpp	23 Feb 2004 11:15:03 -0000	2.235
+++ script_v2.cpp	3 Mar 2004 02:42:51 -0000	2.236
@@ -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;
 		}
@@ -1404,7 +1400,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.611
retrieving revision 2.612
diff -u -d -r2.611 -r2.612
--- scummvm.cpp	2 Mar 2004 20:35:47 -0000	2.611
+++ scummvm.cpp	3 Mar 2004 02:42:51 -0000	2.612
@@ -1041,7 +1041,7 @@
 		_actors[i].initActor(1);
 	
 		// this is from IDB
-		if (_version == 1)
+		if ((_version == 1) || (_version == 2 && _demoMode))
 			_actors[i].setActorCostume(i);
 	}