[Scummvm-cvs-logs] CVS: scummvm/scumm script_v2.cpp,2.239,2.240 scummvm.cpp,2.614,2.615

Travis Howell kirben at users.sourceforge.net
Wed Mar 3 19:30:15 CET 2004


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

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

Add hack for demo script in maniac (Enchanced)


Index: script_v2.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v2.cpp,v
retrieving revision 2.239
retrieving revision 2.240
diff -u -d -r2.239 -r2.240
--- script_v2.cpp	3 Mar 2004 08:17:21 -0000	2.239
+++ script_v2.cpp	4 Mar 2004 03:08:42 -0000	2.240
@@ -702,6 +702,8 @@
 	case 5:		// SO_TALK_COLOR
 		if ((_gameId == GID_MANIAC) && (_version == 1))
 			v1_mm_actor_speech_color[act] = arg;
+		else if (_gameId == GID_MANIAC && _demoMode)
+			a->talkColor = 15;
 		else
 			a->talkColor = arg;
 		break;

Index: scummvm.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/scummvm.cpp,v
retrieving revision 2.614
retrieving revision 2.615
diff -u -d -r2.614 -r2.615
--- scummvm.cpp	4 Mar 2004 02:47:39 -0000	2.614
+++ scummvm.cpp	4 Mar 2004 03:08:42 -0000	2.615
@@ -1045,6 +1045,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;
 
@@ -2503,7 +2514,7 @@
 	int args[16];
 	memset(args, 0, sizeof(args));
 	args[0] = _bootParam;	
-	if (_gameId == GID_MANIAC && _version == 1 && _demoMode)
+	if (_gameId == GID_MANIAC && _demoMode)
 		runScript(9, 0, 0, args);
 	else
 		runScript(1, 0, 0, args);





More information about the Scummvm-git-logs mailing list