diff options
| author | Filippos Karapetis | 2010-06-08 13:15:05 +0000 |
|---|---|---|
| committer | Filippos Karapetis | 2010-06-08 13:15:05 +0000 |
| commit | 707ccdbac78510a5861d9460d1503e25f6634947 (patch) | |
| tree | 0c1fc7e46e988a8e1484651418fadabb0b7376a9 | |
| parent | f743468ec7174088dffde0fd1a61d3afcf78280b (diff) | |
| download | scummvm-rg350-707ccdbac78510a5861d9460d1503e25f6634947.tar.gz scummvm-rg350-707ccdbac78510a5861d9460d1503e25f6634947.tar.bz2 scummvm-rg350-707ccdbac78510a5861d9460d1503e25f6634947.zip | |
Add a version check for base36 encoded patches - they were introduced in SCI2
svn-id: r49501
| -rw-r--r-- | engines/sci/resource.cpp | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/engines/sci/resource.cpp b/engines/sci/resource.cpp index 400f0b1e67..fd81c8d92f 100644 --- a/engines/sci/resource.cpp +++ b/engines/sci/resource.cpp @@ -621,7 +621,9 @@ void ResourceManager::scanNewSources() { case kSourceDirectory: readResourcePatches(source); #ifdef ENABLE_SCI32 - readResourcePatchesBase36(source); + // We can't use getSciVersion() at this point, thus using _volVersion + if (_volVersion == kResVersionSci32) // SCI2+ + readResourcePatchesBase36(source); #endif readWaveAudioPatches(); break; @@ -1180,6 +1182,8 @@ void ResourceManager::readResourcePatchesBase36(ResourceSource *source) { inputName.toUppercase(); if (inputName.hasPrefix("BOOT")) // skip bootdisk.* continue; + if (inputName.hasSuffix("DRV")) // skip AUD*.DRV + continue; inputName.deleteChar(0); // delete the first character (type) inputName.deleteChar(7); // delete the dot |