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

[mthreepwood at users.sourceforge.net]

Revision: 51644
          http://scummvm.svn.sourceforge.net/scummvm/?rev=51644&view=rev
Author:   mthreepwood
Date:     2010-08-02 18:25:48 +0000 (Mon, 02 Aug 2010)

Log Message:
-----------
SCI: Cleanup SCI0 late version detection

After discussing with Walter, we should be able to detect SCI0 late on the presence of a SCI0 vocab.999 without checking if we're using the old decompressors.

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

Modified: scummvm/trunk/engines/sci/resource.cpp
===================================================================
--- scummvm/trunk/engines/sci/resource.cpp	2010-08-02 18:04:23 UTC (rev 51643)
+++ scummvm/trunk/engines/sci/resource.cpp	2010-08-02 18:25:48 UTC (rev 51644)
@@ -1907,18 +1907,18 @@
 			return;
 		}
 
+		if (hasSci0Voc999()) {
+			s_sciVersion = SCI_VERSION_0_LATE;
+			return;
+		}
+
 		if (oldDecompressors) {
 			// It's either SCI_VERSION_0_LATE or SCI_VERSION_01
 
 			// We first check for SCI1 vocab.999
 			if (testResource(ResourceId(kResourceTypeVocab, 999))) {
-				if (hasSci0Voc999()) {
-					s_sciVersion = SCI_VERSION_0_LATE;
-					return;
-				} else {
-					s_sciVersion = SCI_VERSION_01;
-					return;
-				}
+				s_sciVersion = SCI_VERSION_01;
+				return;
 			}
 
 			// If vocab.999 is missing, we try vocab.900
@@ -1938,12 +1938,7 @@
 			return;
 		}
 
-		// New decompressors. It's either SCI_VERSION_0_LATE, SCI_VERSION_1_EGA or SCI_VERSION_1_EARLY.
-		if (testResource(ResourceId(kResourceTypeVocab, 0))) {
-			s_sciVersion = SCI_VERSION_0_LATE;
-			return;
-		}
-
+		// New decompressors. It's either SCI_VERSION_1_EGA or SCI_VERSION_1_EARLY.
 		if (hasSci1Voc900()) {
 			s_sciVersion = SCI_VERSION_1_EGA;
 			return;


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