[Scummvm-cvs-logs] CVS: tools descumm.cpp,1.5,1.6

Max Horn fingolfin at users.sourceforge.net
Sun May 4 07:10:45 CEST 2003


Update of /cvsroot/scummvm/tools
In directory sc8-pr-cvs1:/tmp/cvs-serv29202

Modified Files:
	descumm.cpp 
Log Message:
should be fine to just check for V5 vs V3 here, I think; if not we can always fix it 'properly' once we know what that means in this context ;-)

Index: descumm.cpp
===================================================================
RCS file: /cvsroot/scummvm/tools/descumm.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- descumm.cpp	4 May 2003 13:19:42 -0000	1.5
+++ descumm.cpp	4 May 2003 14:05:18 -0000	1.6
@@ -698,11 +698,10 @@
 			break;
 		case 0x11:
 			// FIXME for GID_MONKEY_VGA / GID_MONKEY_EGA this is:
-#if GID_MONKEY_VGA || GID_MONKEY_EGA
-			buf = do_tok(buf, "Scale", ((opcode & 0x80) ? A1V : A1B));
-#else
-			buf = do_tok(buf, "Scale", ((opcode & 0x80) ? A1V : A1B) | ((opcode & 0x40) ? A2V : A2B));
-#endif
+			if (ScriptVersion == 5)
+				buf = do_tok(buf, "Scale", ((opcode & 0x80) ? A1V : A1B) | ((opcode & 0x40) ? A2V : A2B));
+			else
+				buf = do_tok(buf, "Scale", ((opcode & 0x80) ? A1V : A1B));
 			break;
 		case 0x12:
 			buf = do_tok(buf, "NeverZClip", 0);





More information about the Scummvm-git-logs mailing list