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

[fingolfin at users.sourceforge.net]

Revision: 21700
Author:   fingolfin
Date:     2006-04-08 15:05:45 -0700 (Sat, 08 Apr 2006)
ViewCVS:  http://svn.sourceforge.net/scummvm/?rev=21700&view=rev

Log Message:
-----------
Our extra_versions table is a bit too eager in some cases to assign platform values; fixing some of these cases and adding code that detects these and triggers an according warning

Modified Paths:
--------------
    scummvm/trunk/engines/scumm/plugin.cpp
Modified: scummvm/trunk/engines/scumm/plugin.cpp
===================================================================
--- scummvm/trunk/engines/scumm/plugin.cpp	2006-04-08 19:26:15 UTC (rev 21699)
+++ scummvm/trunk/engines/scumm/plugin.cpp	2006-04-08 22:05:45 UTC (rev 21700)
@@ -424,15 +424,15 @@
 
 
 	/* Scumm Version 5 */
-	{"monkey2", 0, GID_MONKEY2, 5, 0, /*MDT_PCSPK |*/ MDT_ADLIB | MDT_MIDI, GF_USE_KEY, Common::kPlatformPC},
+	{"monkey2", 0, GID_MONKEY2, 5, 0, /*MDT_PCSPK |*/ MDT_ADLIB | MDT_MIDI, GF_USE_KEY, UNK},
 
-	{"atlantis", 0, GID_INDY4, 5, 0, MDT_ADLIB | MDT_MIDI, GF_USE_KEY, Common::kPlatformPC},
+	{"atlantis", 0, GID_INDY4, 5, 0, MDT_ADLIB | MDT_MIDI, GF_USE_KEY, UNK},
 
 
 	/* Scumm Version 6 */
-	{"tentacle", 0, GID_TENTACLE, 6, 0, /*MDT_PCSPK |*/ MDT_ADLIB | MDT_MIDI, GF_USE_KEY, Common::kPlatformPC},
+	{"tentacle", 0, GID_TENTACLE, 6, 0, /*MDT_PCSPK |*/ MDT_ADLIB | MDT_MIDI, GF_USE_KEY, UNK},
 
-	{"samnmax", 0, GID_SAMNMAX, 6, 0, /*MDT_PCSPK |*/ MDT_ADLIB | MDT_MIDI, GF_USE_KEY, Common::kPlatformPC},
+	{"samnmax", 0, GID_SAMNMAX, 6, 0, /*MDT_PCSPK |*/ MDT_ADLIB | MDT_MIDI, GF_USE_KEY, UNK},
 
 
 #ifndef DISABLE_SCUMM_7_8
@@ -1352,8 +1352,12 @@
 					// Perfect match found, use it and stop the loop
 					game = *g;
 					game.gameid = gameid;
-					if (elem->platform != Common::kPlatformUnknown)
+					if (elem->platform != Common::kPlatformUnknown) {
+						if (game.platform != Common::kPlatformUnknown && game.platform != elem->platform)
+							warning("Platform values differ for MD5 '%s': %d vs %d (please report to Fingolfin)",
+										md5, game.platform, elem->platform);
 						game.platform = elem->platform;
+					}
 					break;
 				}
 			}


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