[Scummvm-git-logs] scummvm master -> dc7e37fdb6800124cccf231282d4b1475249a654

[csnover]

This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
dc7e37fdb6 SCI32: Fix extremely broken patch for RAMA RESOURCE.SFX


Commit: dc7e37fdb6800124cccf231282d4b1475249a654
    https://github.com/scummvm/scummvm/commit/dc7e37fdb6800124cccf231282d4b1475249a654
Author: Colin Snover (github.com at zetafleet.com)
Date: 2017-09-29T23:02:38-05:00

Commit Message:
SCI32: Fix extremely broken patch for RAMA RESOURCE.SFX

Obviously, games other than RAMA need to have sound effects
volumes.

Changed paths:
    engines/sci/resource.cpp


diff --git a/engines/sci/resource.cpp b/engines/sci/resource.cpp
index 97cec40..af2ff60 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 {