[Scummvm-cvs-logs] CVS: scummvm/scumm scummvm.cpp,2.368,2.369

[Travis Howell]

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

Modified Files:
	scummvm.cpp 
Log Message:

Add mac check.


Index: scummvm.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/scummvm.cpp,v
retrieving revision 2.368
retrieving revision 2.369
diff -u -d -r2.368 -r2.369
--- scummvm.cpp	5 Sep 2003 10:53:57 -0000	2.368
+++ scummvm.cpp	5 Sep 2003 15:25:31 -0000	2.369
@@ -880,9 +880,8 @@
 		if (_version < 7)
 			VAR(VAR_VERSION) = 21;
 	
-		if (!(_features & GF_OLD_BUNDLE && (_gameId == GID_LOOM || _gameId == GID_INDY3))) {
-			// This is the for the Mac version of Indy3/Loom. TODO: add code to properly
-			// distinguish the Mac version from the PC (and other) versions.
+		if (!(_features & GF_MACINTOSH) && (_version == 3)) {
+			// This is the for the Mac version of Indy3/Loom
 			VAR(VAR_DEBUGMODE) = _debugMode;
 		}
 	}
@@ -1141,9 +1140,8 @@
 		VAR(VAR_59) = 3;
 	}
 	
-	if (_features & GF_OLD_BUNDLE && (_gameId == GID_LOOM || _gameId == GID_INDY3)) {
-		// This is the for the Mac version of Indy3/Loom. TODO: add code to properly
-		// distinguish the Mac version from the PC (and other) versions.
+	if ((_features & GF_MACINTOSH) && (_version == 3)) {
+		// This is the for the Mac version of Indy3/Loom
 		VAR(39) = 320;
 	}
 
@@ -1260,9 +1258,8 @@
 		VAR(VAR_VIRT_MOUSE_Y) = _virtualMouse.y;
 		VAR(VAR_MOUSE_X) = _mouse.x;
 		VAR(VAR_MOUSE_Y) = _mouse.y;
-		if (_features & GF_OLD_BUNDLE && (_gameId == GID_LOOM || _gameId == GID_INDY3)) {
-			// This is the for the Mac version of Indy3/Loom. TODO: add code to properly
-			// distinguish the Mac version from the PC (and other) versions.
+		if ((_features & GF_MACINTOSH) && (_version == 3))  {
+			// This is the for the Mac version of Indy3/Loom
 			VAR(VAR_DEBUGMODE) = _debugMode;
 		}
 	}