diff options
| author | Colin Snover | 2017-09-29 23:01:58 -0500 |
|---|---|---|
| committer | Colin Snover | 2017-09-29 23:02:38 -0500 |
| commit | dc7e37fdb6800124cccf231282d4b1475249a654 (patch) | |
| tree | 0573499354d5f318c5b4cebb4770a68c508a958a /engines | |
| parent | e4a1a0e98079317da8cb1a8c5d221e61c18da698 (diff) | |
| download | scummvm-rg350-dc7e37fdb6800124cccf231282d4b1475249a654.tar.gz scummvm-rg350-dc7e37fdb6800124cccf231282d4b1475249a654.tar.bz2 scummvm-rg350-dc7e37fdb6800124cccf231282d4b1475249a654.zip | |
SCI32: Fix extremely broken patch for RAMA RESOURCE.SFX
Obviously, games other than RAMA need to have sound effects
volumes.
Diffstat (limited to 'engines')
| -rw-r--r-- | engines/sci/resource.cpp | 16 |
1 files changed, 7 insertions, 9 deletions
diff --git a/engines/sci/resource.cpp b/engines/sci/resource.cpp index 97cec405b3..af2ff60d59 100644 --- a/engines/sci/resource.cpp +++ b/engines/sci/resource.cpp @@ -1928,15 +1928,13 @@ int ResourceManager::readResourceMapSCI1(ResourceSource *map) { volumeName = "RESAUD.001"; } } else if (resId.getNumber() == 65535) { - if (g_sci->getGameId() == GID_RAMA) { - volumeName = Common::String::format("RESSFX.%03d", mapVolumeNr); - - if (g_sci->getGameId() == GID_RAMA && !Common::File::exists(volumeName)) { - if (Common::File::exists("RESOURCE.SFX")) { - volumeName = "RESOURCE.SFX"; - } else if (Common::File::exists("RESSFX.001")) { - volumeName = "RESSFX.001"; - } + volumeName = Common::String::format("RESSFX.%03d", mapVolumeNr); + + if (g_sci->getGameId() == GID_RAMA && !Common::File::exists(volumeName)) { + if (Common::File::exists("RESOURCE.SFX")) { + volumeName = "RESOURCE.SFX"; + } else if (Common::File::exists("RESSFX.001")) { + volumeName = "RESSFX.001"; } } } else { |