libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-02-24 21:21:05 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Don't patch audio36 resources, when the associated patches are for audio resources (e.g. the sound effects in LB2CD)

Browse Source 
svn-id: r47603
This commit is contained in:
Filippos Karapetis 2010-01-27 16:59:20 +00:00
parent 12569a5f32
commit 9471e66940
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
engines/sci/resource.cpp
View File

@ -996,8 +996,13 @@ void ResourceManager::processPatch(ResourceSource *source, ResourceType restype,
patch_data_offset = file.readByte();
if (patchtype != restype) {
debug("Patching %s failed - resource type mismatch", source->location_name.c_str());
return;
// audio and audio36 resources got the same extension, so don't try and load them twice
if (patchtype == kResourceTypeAudio && restype == kResourceTypeAudio36) {
return; // don't throw a warning, the relevant audio resource has already been patched
} else {
debug("Patching %s failed - resource type mismatch", source->location_name.c_str());
return;
}
}
// Fixes SQ5/German, patch file special case logic taken from SCI View disassembly