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

[wjpalenstijn at users.sourceforge.net]

Revision: 38563
          http://scummvm.svn.sourceforge.net/scummvm/?rev=38563&view=rev
Author:   wjpalenstijn
Date:     2009-02-19 20:47:06 +0000 (Thu, 19 Feb 2009)

Log Message:
-----------
don't give up scanning files after one potential executable (such as sierra.ico...)

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

Modified: scummvm/trunk/engines/sci/detection.cpp
===================================================================
--- scummvm/trunk/engines/sci/detection.cpp	2009-02-19 20:20:14 UTC (rev 38562)
+++ scummvm/trunk/engines/sci/detection.cpp	2009-02-19 20:47:06 UTC (rev 38563)
@@ -1716,29 +1716,19 @@
 			Common::SeekableReadStream *fileStream = file->createReadStream();
 			bool isExe = isGameExe(fileStream);
 
-			if (isExe) {
-				if (!readSciVersionFromExe(fileStream, &exeVersion)) {
-					printf("Error while reading SCI version from the game executable\n");
-					delete fileStream;
-					return 0;
-				} else {
-					// All ok, we got the version from the executable successfully
-					foundExe = true;
-					delete fileStream;
-					break;
-				}
-			} else {
-				printf("The original game executable seems to be corrupted\n");
+			if (isExe && readSciVersionFromExe(fileStream, &exeVersion)) {
+				// All ok, we got the version from the executable successfully
+				foundExe = true;
 				delete fileStream;
-				return 0;
-			}
-
+				break;
+			} 
+			delete fileStream;
 		}
 
 	}
 	
 	if (!foundExe) {
-		printf("The original game executable wasn't found\n");
+		printf("No original game executable containing a version number was found\n");
 		return 0;
 	}
 


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