[Scummvm-cvs-logs] SF.net SVN: scummvm:[47086] scummvm/trunk/engines/sci/detection.cpp

[thebluegr at users.sourceforge.net]

Revision: 47086
          http://scummvm.svn.sourceforge.net/scummvm/?rev=47086&view=rev
Author:   thebluegr
Date:     2010-01-06 16:39:48 +0000 (Wed, 06 Jan 2010)

Log Message:
-----------
Removed a hack from the fallback detector, used to distinguish some demos from their full versions

Modified Paths:
--------------
    scummvm/trunk/engines/sci/detection.cpp

Modified: scummvm/trunk/engines/sci/detection.cpp
===================================================================
--- scummvm/trunk/engines/sci/detection.cpp	2010-01-06 16:11:21 UTC (rev 47085)
+++ scummvm/trunk/engines/sci/detection.cpp	2010-01-06 16:39:48 UTC (rev 47086)
@@ -195,9 +195,6 @@
 const ADGameDescription *SciMetaEngine::fallbackDetect(const Common::FSList &fslist) const {
 	bool foundResMap = false;
 	bool foundRes000 = false;
-	// This flag is used to determine if the size of resource.000 is less than 1MB, to distinguish
-	// between full and demo versions
-	bool smallResource000Size = false;
 
 	// Set some defaults
 	s_fallbackDesc.extra = "";
@@ -246,13 +243,6 @@
 			delete tmpStream;
 		}
 
-		if (filename.contains("resource.000")) {
-			Common::SeekableReadStream *tmpStream = file->createReadStream();
-			if (tmpStream->size() < 1 * 1024 * 1024)
-				smallResource000Size = true;
-			delete tmpStream;
-		}
-
 		if (filename.contains("resource.000") || filename.contains("resource.001")
 			|| filename.contains("ressci.000") || filename.contains("ressci.001"))
 			foundRes000 = true;
@@ -342,20 +332,6 @@
 
 	delete resMan;
 
-	// Distinguish demos from full versions
-	if (!strcmp(s_fallbackDesc.gameid, "castlebrain") && !Common::File::exists("resource.002")) {
-		// The Spanish full version doesn't have resource.002, but we can distinguish it from the
-		// demo from the size of resource.000
-		if (smallResource000Size)
-			s_fallbackDesc.flags |= ADGF_DEMO;
-	}
-
-	if (!strcmp(s_fallbackDesc.gameid, "islandbrain") && smallResource000Size)
-		s_fallbackDesc.flags |= ADGF_DEMO;
-
-	if (!strcmp(s_fallbackDesc.gameid, "kq6") && smallResource000Size)
-		s_fallbackDesc.flags |= ADGF_DEMO;
-
 	// Fill in extras field
 	if (!strcmp(s_fallbackDesc.gameid, "lsl1sci") ||
 		!strcmp(s_fallbackDesc.gameid, "pq1sci") ||


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