[Scummvm-cvs-logs] CVS: scummvm/scumm script_v2.cpp,2.151,2.152

Max Horn fingolfin at users.sourceforge.net
Mon Jul 14 11:21:15 CEST 2003


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

Modified Files:
	script_v2.cpp 
Log Message:
proper fix for V1/Zak (and maybe V1/MM, too?) ActorSet-Color

Index: script_v2.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v2.cpp,v
retrieving revision 2.151
retrieving revision 2.152
diff -u -d -r2.151 -r2.152
--- script_v2.cpp	14 Jul 2003 06:19:06 -0000	2.151
+++ script_v2.cpp	14 Jul 2003 18:20:20 -0000	2.152
@@ -686,15 +686,15 @@
 			break;
 
 		case 2:		// Actor Set Color
-			i = fetchScriptByte();
-			a->palette[i] = arg;
-			a->needRedraw = true;
-
-			// FIXME: Hack for V1 Zak
 			if ((_gameId == GID_ZAK) && (_version == 1)) {
-				fetchScriptByte();
-				fetchScriptByte();
+				// FIXME: maybe this is needed for MM v1, too, but so far I have
+				// not seen any call to this in it at all, so I don't know
+				i = 3;
+			} else {
+				i = fetchScriptByte();
 			}
+			a->palette[i] = arg;
+			a->needRedraw = true;
 			break;
 
 		case 3:		// Actor Name





More information about the Scummvm-git-logs mailing list