aboutsummaryrefslogtreecommitdiff
path: root/engines/sci/resource.cpp
diff options
context:
space:
mode:
authorMatthew Hoops2010-08-02 14:14:06 +0000
committerMatthew Hoops2010-08-02 14:14:06 +0000
commitc715f18273a51629d73cd185b94f8c036d5c15de (patch)
tree30e6430172a4f30a9190fd8dbd28bcd442f45e7c /engines/sci/resource.cpp
parent8cfce68c087d75b96524aee36b85364074bf4574 (diff)
downloadscummvm-rg350-c715f18273a51629d73cd185b94f8c036d5c15de.tar.gz
scummvm-rg350-c715f18273a51629d73cd185b94f8c036d5c15de.tar.bz2
scummvm-rg350-c715f18273a51629d73cd185b94f8c036d5c15de.zip
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). svn-id: r51619
Diffstat (limited to 'engines/sci/resource.cpp')
-rw-r--r--engines/sci/resource.cpp16
1 files changed, 8 insertions, 8 deletions
diff --git a/engines/sci/resource.cpp b/engines/sci/resource.cpp
index 111bf6ad9b..9d722a08c0 100644
--- a/engines/sci/resource.cpp
+++ b/engines/sci/resource.cpp
@@ -1939,14 +1939,14 @@ void ResourceManager::detectSciVersion() {
}
// 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