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

[mthreepwood at users.sourceforge.net]

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

Log Message:
-----------
SCI: Fix bug #3037055: Jones in the Fast Lane EGA - fails to start

A regression of r51423. Jones EGA has a non-parser related vocab.900 resource, so we can't detect the fan games based on not having an SCI1 vocab.900 resource. Fan games are now detected on whether or not vocab.0 exists (the parser vocab for SCI0).

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

Modified: scummvm/trunk/engines/sci/resource.cpp
===================================================================
--- scummvm/trunk/engines/sci/resource.cpp	2010-08-02 14:07:30 UTC (rev 51618)
+++ scummvm/trunk/engines/sci/resource.cpp	2010-08-02 14:14:06 UTC (rev 51619)
@@ -1939,16 +1939,16 @@
 		}
 
 		// New decompressors. It's either SCI_VERSION_0_LATE, SCI_VERSION_1_EGA or SCI_VERSION_1_EARLY.
-		if (testResource(ResourceId(kResourceTypeVocab, 900))) {
-			if (hasSci1Voc900()) {
-				s_sciVersion = SCI_VERSION_1_EGA;
-				return;
-			} else {
-				s_sciVersion = SCI_VERSION_0_LATE;
-				return;
-			}
+		if (testResource(ResourceId(kResourceTypeVocab, 0))) {
+			s_sciVersion = SCI_VERSION_0_LATE;
+			return;
 		}
 
+		if (hasSci1Voc900()) {
+			s_sciVersion = SCI_VERSION_1_EGA;
+			return;
+		}
+
 		// SCI_VERSION_1_EARLY EGA versions lack the parser vocab
 		s_sciVersion = SCI_VERSION_1_EARLY;
 		return;


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