[Scummvm-cvs-logs] CVS: scummvm/scumm script_v2.cpp,2.119,2.120

[Max Horn]

Update of /cvsroot/scummvm/scummvm/scumm
In directory sc8-pr-cvs1:/tmp/cvs-serv12093

Modified Files:
	script_v2.cpp 
Log Message:
don't hardcode 9 but rather use the default actor talk color as given in the (v2) bootscript

Index: script_v2.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v2.cpp,v
retrieving revision 2.119
retrieving revision 2.120
diff -u -d -r2.119 -r2.120
--- script_v2.cpp	23 May 2003 06:35:47 -0000	2.119
+++ script_v2.cpp	23 May 2003 12:07:36 -0000	2.120
@@ -412,7 +412,7 @@
 	_string[textSlot].right = 320;
 	_string[textSlot].center = false;
 	_string[textSlot].overhead = false;
-	_string[textSlot].color = 9;	// light blue
+//	_string[textSlot].color = 9;	// light blue
 
 	_messagePtr = buffer;
 	switch (textSlot) {
@@ -669,15 +669,18 @@
 void Scumm_v2::o2_actorSet() {
 	int act = getVarOrDirectByte(0x80);
 	int arg = getVarOrDirectByte(0x40);
-	Actor *a = derefActorSafe(act, "actorSet");
+	Actor *a;
 	int i;
 
 	_opcode = fetchScriptByte();
-	if (!a) {
-		// This case happens in the Zak/MM bootscript exactly once each, to
-		// set the default talk color (9).
+	if (act == 0 && _opcode == 5) {
+		// This case happens in the Zak/MM bootscripts, to set the default talk color (9).
+		_string[0].color = arg;
 		return;
 	}
+	
+	a = derefActorSafe(act, "actorSet");
+	assert(a);
 
 	switch (_opcode) {
 		case 1: 	// Actor Sound