COMPOSER: Split out filename mangling into a separate function.

2 files changed, 6 insertions, 0 deletions

diff --git a/engines/composer/composer.cpp b/engines/composer/composer.cpp
index d3252d43b9..165918adfd 100644
--- a/engines/composer/composer.cpp
+++ b/engines/composer/composer.cpp
@@ -275,6 +275,11 @@ Common::String ComposerEngine::getStringFromConfig(const Common::String &section
 Common::String ComposerEngine::getFilename(const Common::String &section, uint id) {
 	Common::String key = Common::String::format("%d", id);
 	Common::String filename = getStringFromConfig(section, key);
+
+	return mangleFilename(filename);
+}
+
+Common::String ComposerEngine::mangleFilename(Common::String filename) {
 	while (filename.size() && (filename[0] == '~' || filename[0] == ':' || filename[0] == '\\'))
 		filename = filename.c_str() + 1;
 
diff --git a/engines/composer/composer.h b/engines/composer/composer.h
index 99ed56ead7..955b78d3cd 100644
--- a/engines/composer/composer.h
+++ b/engines/composer/composer.h
@@ -172,6 +172,7 @@ private:
 
 	Common::String getStringFromConfig(const Common::String &section, const Common::String &key);
 	Common::String getFilename(const Common::String &section, uint id);
+	Common::String mangleFilename(Common::String filename);
 	void loadLibrary(uint id);
 	void unloadLibrary(uint id);