[Scummvm-cvs-logs] CVS: scummvm/scumm script.cpp,1.149,1.149.2.1 vars.cpp,1.71.2.1,1.71.2.2

[Travis Howell]

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

Modified Files:
      Tag: branch-0-6-0
	script.cpp vars.cpp 
Log Message:

Ooops


Index: script.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script.cpp,v
retrieving revision 1.149
retrieving revision 1.149.2.1
diff -u -d -r1.149 -r1.149.2.1
--- script.cpp	11 Feb 2004 05:38:15 -0000	1.149
+++ script.cpp	3 May 2004 02:27:49 -0000	1.149.2.1
@@ -501,7 +501,9 @@
 				// during the game...
 				if (_gameId == GID_INDY3 && (_features & GF_OLD_BUNDLE) && var == 94 && bit == 4) {
 					return 0;
-//				} else if (_gameId == GID_LOOM && var == 221 && bit == 14) {	// For Mac Loom
+				} else if (var == 221 && bit == 14 && _gameId == GID_LOOM && (_features & GF_MACINTOSH)) {	// For Mac Loom
+					return 0;
+				// For all other Loom versions? PC and FM Towns at least in any event
 				} else if (_gameId == GID_LOOM && var == 214 && bit == 15) {	// For PC Loom
 					return 0;
 				} else if (_gameId == GID_ZAK256 && var == 151 && bit == 8) {

Index: vars.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/vars.cpp,v
retrieving revision 1.71.2.1
retrieving revision 1.71.2.2
diff -u -d -r1.71.2.1 -r1.71.2.2
--- vars.cpp	3 May 2004 02:04:57 -0000	1.71.2.1
+++ vars.cpp	3 May 2004 02:27:49 -0000	1.71.2.2
@@ -62,7 +62,6 @@
 	if (!(_gameId == GID_LOOM && _features & GF_MACINTOSH))
 		VAR_SCROLL_SCRIPT = 27;
 
-	VAR_SCROLL_SCRIPT = 27;
 	VAR_ENTRY_SCRIPT = 28;
 	VAR_ENTRY_SCRIPT2 = 29;
 	VAR_EXIT_SCRIPT = 30;