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

[Travis Howell]

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

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

Allow --demo-mode with maniac (Enchanced)



Index: script_v2.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v2.cpp,v
retrieving revision 2.230.2.1
retrieving revision 2.230.2.2
diff -u -d -r2.230.2.1 -r2.230.2.2
--- script_v2.cpp	3 Mar 2004 03:13:47 -0000	2.230.2.1
+++ script_v2.cpp	8 Mar 2004 02:42:37 -0000	2.230.2.2
@@ -771,6 +771,10 @@
 	if ((opcode & 0x0f) == 0 || type == rtNumTypes)
 		return;
 
+	// HACK V2 Maniac Mansion tries to load an invalid sound resource in demo script.
+	if (_gameId == GID_MANIAC && _version == 2 && vm.slot[_currentScript].number == 9 && type == rtSound && resid == 1)
+		return;
+
 	if ((opcode & 0x0f) == 1) {
 		ensureResourceLoaded(type, resid);
 	} else {

Index: scummvm.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/Attic/scummvm.cpp,v
retrieving revision 2.577.2.4
retrieving revision 2.577.2.5
diff -u -d -r2.577.2.4 -r2.577.2.5
--- scummvm.cpp	3 Mar 2004 03:13:47 -0000	2.577.2.4
+++ scummvm.cpp	8 Mar 2004 02:42:37 -0000	2.577.2.5
@@ -954,7 +954,7 @@
 		args[0] = _bootParam;	
 
 		_saveLoadFlag = 0;
-		if (_gameId == GID_MANIAC && _version == 1 && _demoMode)
+		if (_gameId == GID_MANIAC && _demoMode)
 			runScript(9, 0, 0, args);
 		else
 			runScript(1, 0, 0, args);
@@ -1028,6 +1028,17 @@
 			_actors[i].setActorCostume(i);
 	}
 
+	// HACK Some palette changes needed for demo script
+	// in Maniac Mansion (Enchanced)
+	if (_gameId == GID_MANIAC && _version == 2 && _demoMode) {
+		_actors[3].setPalette(3, 1);
+		_actors[9].talkColor = 15;
+		_actors[10].talkColor = 7;
+		_actors[11].talkColor = 2;
+		_actors[13].talkColor = 5;
+		_actors[23].talkColor = 14;
+	}
+
 	vm.numNestedScripts = 0;
 	vm.cutSceneStackPointer = 0;