diff options
| author | Filippos Karapetis | 2010-09-18 09:47:18 +0000 |
|---|---|---|
| committer | Filippos Karapetis | 2010-09-18 09:47:18 +0000 |
| commit | 928bcdbe094767fefb7c415e098d7d9e47bc078d (patch) | |
| tree | 3a091612c3a4451b0f6e4a12a078f67993d494b6 /engines/sci/resource_audio.cpp | |
| parent | 1e9e8cd64a97ade7d8f9ff891e511d47b98da70d (diff) | |
| download | scummvm-rg350-928bcdbe094767fefb7c415e098d7d9e47bc078d.tar.gz scummvm-rg350-928bcdbe094767fefb7c415e098d7d9e47bc078d.tar.bz2 scummvm-rg350-928bcdbe094767fefb7c415e098d7d9e47bc078d.zip | |
SCI: Some changes to the fallback detector (sync with branch 1.2.0)
Added more graceful handling of the case where SCI32 isn't built in and the
user tries to detect or start a SCI32 game
svn-id: r52789
Diffstat (limited to 'engines/sci/resource_audio.cpp')
| -rw-r--r-- | engines/sci/resource_audio.cpp | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/engines/sci/resource_audio.cpp b/engines/sci/resource_audio.cpp index 4217ed1000..d690ecaad7 100644 --- a/engines/sci/resource_audio.cpp +++ b/engines/sci/resource_audio.cpp @@ -273,6 +273,13 @@ void ResourceManager::removeAudioResource(ResourceId resId) { // w syncAscSize (iff seq has bit 6 set) int ResourceManager::readAudioMapSCI11(ResourceSource *map) { +#ifndef ENABLE_SCI32 + // SCI32 support is not built in. Check if this is a SCI32 game + // and if it is abort here. + if (_volVersion == kResVersionSci32) + return SCI_ERROR_RESMAP_NOT_FOUND; +#endif + uint32 offset = 0; Resource *mapRes = findResource(ResourceId(kResourceTypeMap, map->_volumeNumber), false); |