[Scummvm-cvs-logs] CVS: scummvm/scumm vars.cpp,1.147,1.148

[kirben]

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

Modified Files:
	vars.cpp 
Log Message:

Another regression, in Mac. version of indy3.


Index: vars.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/vars.cpp,v
retrieving revision 1.147
retrieving revision 1.148
diff -u -d -r1.147 -r1.148
--- vars.cpp	26 Sep 2005 00:01:02 -0000	1.147
+++ vars.cpp	26 Sep 2005 13:46:38 -0000	1.148
@@ -666,9 +666,9 @@
 
 		if (_platform == Common::kPlatformFMTowns)
 			VAR(VAR_VIDEOMODE) = 42;
-		else if (_gameId == GID_INDY3 && (_platform == Common::kPlatformMacintosh))
+		else if (_platform == Common::kPlatformMacintosh)
 			VAR(VAR_VIDEOMODE) = 50;
-		else if (_gameId == GID_MONKEY2 && (_platform == Common::kPlatformAmiga))
+		else if (_platform == Common::kPlatformAmiga)
 			VAR(VAR_VIDEOMODE) = 82;
 		else if (_renderMode == Common::kRenderCGA)
 			VAR(VAR_VIDEOMODE) = 4;
@@ -680,20 +680,20 @@
 			VAR(VAR_VIDEOMODE) = 19;
 
 		VAR(VAR_CURRENTDRIVE) = 0;
-		if (_gameId == GID_LOOM && (_features & GF_OLD_BUNDLE)) {
-			if (_platform == Common::kPlatformMacintosh) {
-				// This is the for the Mac version of Indy3/Loom
-				VAR(39) = 320;
-			} else {
-				// Set number of sound resources
-				VAR(39) = 80;
-			}
-			VAR(VAR_HEAPSPACE) = 1400;
+
+		if (_platform == Common::kPlatformMacintosh && (_features & GF_OLD_BUNDLE)) {
+			// This is the for the Mac version of Indy3/Loom
+			VAR(39) = 320;
 		}
-		if (_version >= 4) {
+		if (_platform == Common::kPlatformPC && _gameId == GID_LOOM) {
+			// Set number of sound resources
+			VAR(39) = 80;
+		}
+
+		if (_gameId == GID_LOOM || _version >= 4)
 			VAR(VAR_HEAPSPACE) = 1400;
+		if (_version >= 4)
 			VAR(VAR_FIXEDDISK) = 1;
-		}
 		if (_version >= 5)
 			VAR(VAR_MOUSEPRESENT) = 1;
 		if (_version == 6)