[Scummvm-cvs-logs] SF.net SVN: scummvm: [23260] scummvm/trunk/engines/scumm/plugin.cpp

[fingolfin at users.sourceforge.net]

Revision: 23260
Author:   fingolfin
Date:     2006-06-22 10:57:37 -0700 (Thu, 22 Jun 2006)
ViewCVS:  http://svn.sourceforge.net/scummvm/?rev=23260&view=rev

Log Message:
-----------
Tweak SCUMM detection a bit more -- do not hard code a check for the genmethod to determine the platform value, but rather use the platform value the GameFilenamePattern provides

Modified Paths:
--------------
    scummvm/trunk/engines/scumm/plugin.cpp
Modified: scummvm/trunk/engines/scumm/plugin.cpp
===================================================================
--- scummvm/trunk/engines/scumm/plugin.cpp	2006-06-22 13:04:19 UTC (rev 23259)
+++ scummvm/trunk/engines/scumm/plugin.cpp	2006-06-22 17:57:37 UTC (rev 23260)
@@ -991,16 +991,13 @@
 								dr.game = *g;
 								dr.game.gameid = d.md5Entry->gameid;
 
-								// Sanity check
-								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);
-
-								// 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 {
+								// Set the platform value. The value from the MD5 record has
+								// highest priority; if missing (i.e. set to unknown) we try
+								// to use that from the filename pattern record instead.
+								if (d.md5Entry->platform != Common::kPlatformUnknown) {
 									dr.game.platform = d.md5Entry->platform;
+								} else if (gfp->platform != Common::kPlatformUnknown) {
+									dr.game.platform = gfp->platform;
 								}
 								
 								// HACK: Special case to distinguish the V1 demo from the full version


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