[Scummvm-cvs-logs] SF.net SVN: scummvm: [23220] scummvm/branches/branch-0-9-0

kirben at users.sourceforge.net kirben at users.sourceforge.net
Wed Jun 21 14:32:27 CEST 2006


Revision: 23220
Author:   kirben
Date:     2006-06-21 05:32:18 -0700 (Wed, 21 Jun 2006)
ViewCVS:  http://svn.sourceforge.net/scummvm/?rev=23220&view=rev

Log Message:
-----------
Add back auto detection of Macintosh platform for HE games

Modified Paths:
--------------
    scummvm/branches/branch-0-9-0/README
    scummvm/branches/branch-0-9-0/doc/games-mac.tex
    scummvm/branches/branch-0-9-0/engines/scumm/plugin.cpp
Modified: scummvm/branches/branch-0-9-0/README
===================================================================
--- scummvm/branches/branch-0-9-0/README	2006-06-21 11:33:40 UTC (rev 23219)
+++ scummvm/branches/branch-0-9-0/README	2006-06-21 12:32:18 UTC (rev 23220)
@@ -281,10 +281,6 @@
 Macintosh. You used to have to manually convert that data file, but this is no
 longer necessary, as ScummVM can now open and understand the format natively.
 
-For all Humongous Entertainment Macintosh games you have to set the platform
-to Macintosh manually for them to work, otherwise the games will crash soon
-after the intro.
-
 For further information on copying Macintosh game files to your hard disk see:
 
   http://wiki.scummvm.org/index.php/HOWTO-Mac_Games

Modified: scummvm/branches/branch-0-9-0/doc/games-mac.tex
===================================================================
--- scummvm/branches/branch-0-9-0/doc/games-mac.tex	2006-06-21 11:33:40 UTC (rev 23219)
+++ scummvm/branches/branch-0-9-0/doc/games-mac.tex	2006-06-21 12:32:18 UTC (rev 23220)
@@ -13,10 +13,6 @@
 Macintosh. You used to have to manually convert that data file, but this is no
 longer necessary, as ScummVM can now open and understand the format natively.
 
-For all Humongous Entertainment Macintosh games you have to set the platform
-to Macintosh manually for them to work, otherwise the games will crash soon
-after the intro.
-
 For further information on copying Macintosh game files to your hard disk see:
 
   \url{http://wiki.scummvm.org/index.php/HOWTO-Mac_Games}

Modified: scummvm/branches/branch-0-9-0/engines/scumm/plugin.cpp
===================================================================
--- scummvm/branches/branch-0-9-0/engines/scumm/plugin.cpp	2006-06-21 11:33:40 UTC (rev 23219)
+++ scummvm/branches/branch-0-9-0/engines/scumm/plugin.cpp	2006-06-21 12:32:18 UTC (rev 23220)
@@ -995,7 +995,13 @@
 								if (dr.game.platform != Common::kPlatformUnknown && dr.game.platform != d.md5Entry->platform)
 									warning("SCUMM detectGames: Platform values differ for MD5 '%s': %d vs %d (please report to Fingolfin)",
 													md5str, dr.game.platform, d.md5Entry->platform);
-								dr.game.platform = d.md5Entry->platform;
+
+								// Force game to have Mac platform, if required by HE game
+								if (dr.fp.genMethod == kGenHEMac || dr.fp.genMethod == kGenHEMacNoParens) {
+									dr.game.platform = Common::kPlatformMacintosh;
+								} else {
+									dr.game.platform = d.md5Entry->platform;
+								}
 								
 								// HACK: Special case to distinguish the V1 demo from the full version
 								// (since they have identical MD5):
@@ -1045,8 +1051,13 @@
 
 			dr.game = *g;
 			dr.extra = g->variant; // FIXME: We (ab)use 'variant' for the 'extra' description for now.
-			if (gfp->platform != Common::kPlatformUnknown)
+
+			// Force game to have Mac platform, if required by HE game
+			if (dr.fp.genMethod == kGenHEMac || dr.fp.genMethod == kGenHEMacNoParens) {
+				dr.game.platform = Common::kPlatformMacintosh;
+			} else if (gfp->platform != Common::kPlatformUnknown) {
 				dr.game.platform = gfp->platform;
+			}
 
 
 			// If a variant has been specified, use that!


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.





More information about the Scummvm-git-logs mailing list