diff options
author | Matthew Hoops | 2010-08-02 18:25:48 +0000 |
---|---|---|
committer | Matthew Hoops | 2010-08-02 18:25:48 +0000 |
commit | 180f188b88dd7be12df5152f52f95b9b7039f012 (patch) | |
tree | c2e69ce77a2676ded63c323a05c7c7f7ee1b6233 /engines/sci/resource.cpp | |
parent | 512fec56c7bc3095463c4eaaf4c8e84d3113b151 (diff) | |
download | scummvm-rg350-180f188b88dd7be12df5152f52f95b9b7039f012.tar.gz scummvm-rg350-180f188b88dd7be12df5152f52f95b9b7039f012.tar.bz2 scummvm-rg350-180f188b88dd7be12df5152f52f95b9b7039f012.zip |
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.
svn-id: r51644
Diffstat (limited to 'engines/sci/resource.cpp')
-rw-r--r-- | engines/sci/resource.cpp | 21 |
1 files changed, 8 insertions, 13 deletions
diff --git a/engines/sci/resource.cpp b/engines/sci/resource.cpp index 9d722a08c0..2fdf091314 100644 --- a/engines/sci/resource.cpp +++ b/engines/sci/resource.cpp @@ -1907,18 +1907,18 @@ void ResourceManager::detectSciVersion() { 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 @@ void ResourceManager::detectSciVersion() { 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; |