Split SCUMM's generateSubstResFileName into two functions: findSubstResFileName and applySubstResFileName

svn-id: r20879

1 files changed, 9 insertions, 12 deletions

diff --git a/engines/scumm/resource.cpp b/engines/scumm/resource.cpp
index df2c9eb032..7e98b6bf43 100644
--- a/engines/scumm/resource.cpp
+++ b/engines/scumm/resource.cpp
@@ -154,7 +154,7 @@ void ScummEngine::openRoom(const int room) {
 		}
 
 		// If we have substitute
-		if (_substResFileNameIndex > 0 && !(_game.platform == Common::kPlatformNES || _game.platform == Common::kPlatformC64)) {
+		if (_substResFileName.winName != 0 && !(_game.platform == Common::kPlatformNES || _game.platform == Common::kPlatformC64)) {
 			char tmpBuf[128];
 			generateSubstResFileName(buf, tmpBuf, sizeof(tmpBuf));
 			strcpy(buf, tmpBuf);
@@ -255,27 +255,24 @@ bool ScummEngine::openFile(BaseScummFile &file, const char *filename, bool resou
 		// from target name. dottdemo.000 vs tentacle.000. So we should
 		// substitute those names too
 		if (resourceFile == true) {
-			if (_substResFileNameIndexBundle == 0) {
+			if (_substResFileNameBundle.winName == 0) {
 				int substLastIndex = 0;
 
 				while (substLastIndex != -1) {
 					if (file.openSubFile(name))
 						break;
 
-					substLastIndex = generateSubstResFileName(filename, name, sizeof(name), substLastIndex + 1);
+					substLastIndex = findSubstResFileName(_substResFileNameBundle, filename, substLastIndex + 1);
+					applySubstResFileName(_substResFileNameBundle, filename, name, sizeof(name));
 				}
 
-				if (substLastIndex == 0)
-					substLastIndex = -1;
-
-				_substResFileNameIndexBundle = substLastIndex;
-
-				if (substLastIndex != -1)
-					debug(5, "Generated substitute in Mac bundle: [%s -> %s]", filename, name);
+				if (_substResFileNameBundle.winName != 0) {
+					debug(5, "Generated substitute in Mac bundle: [%s -> %s]", filename, _substResFileNameBundle.winName);
+				}
 			}
 
-			if (_substResFileNameIndexBundle != -1)
-				generateSubstResFileName(filename, name, sizeof(name), _substResFileNameIndexBundle);
+			if (_substResFileNameBundle.winName != 0)
+				applySubstResFileName(_substResFileNameBundle, filename, name, sizeof(name));
 		}
 
 		result = file.openSubFile(name);