[Scummvm-cvs-logs] CVS: scummvm/scumm script_v5.cpp,1.179,1.180

[Travis Howell]

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

Modified Files:
	script_v5.cpp 
Log Message:

A few if check fixes from Hibernatus, which were checked against disasm. of related games.


Index: script_v5.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v5.cpp,v
retrieving revision 1.179
retrieving revision 1.180
diff -u -d -r1.179 -r1.180
--- script_v5.cpp	10 Sep 2003 22:35:35 -0000	1.179
+++ script_v5.cpp	11 Sep 2003 09:12:24 -0000	1.180
@@ -491,7 +491,7 @@
 			a->width = getVarOrDirectByte(0x80);
 			break;
 		case 17:										/* scale */
-			if ((_gameId == GID_MONKEY_VGA) || (_gameId == GID_MONKEY_EGA) || (_gameId == GID_PASS)) {
+			if (_version == 4) {
 				a->scalex = a->scaley = getVarOrDirectByte(0x80);
 			} else {
 				a->scalex = getVarOrDirectByte(0x80);
@@ -686,7 +686,7 @@
 		initCharset(getVarOrDirectByte(0x80));
 		break;
 	case 14:											/* unk */
-		if (_gameId == GID_LOOM || _gameId == GID_INDY3) {
+		if (_version == 3) {
 			/*int a = */ getVarOrDirectByte(0x80);
 			/*int b = */ getVarOrDirectByte(0x40);
 			// This is some kind of "init charset" opcode. However, we don't have to do anything