[Scummvm-cvs-logs] scummvm master -> fc3f6fa13ecaeb75cb0eff41f48eadafe4493740

[sev-]

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

Summary:
83f921fa80 WINTERMUTE: Add fallback for hardcoded absolute path in carolreed5
fc3f6fa13e Merge pull request #695 from tobiatesan/fix_7067_a


Commit: 83f921fa8003022c59cffc88d5cf1838cb6c6da6
    https://github.com/scummvm/scummvm/commit/83f921fa8003022c59cffc88d5cf1838cb6c6da6
Author: Tobia Tesan (tobia.tesan at gmail.com)
Date: 2016-03-05T22:19:53+01:00

Commit Message:
WINTERMUTE: Add fallback for hardcoded absolute path in carolreed5

Carol Reed 5 (the full game, data.dcp hash
27b3efc018ade5ee8f4adf08b4e3c0dd) refers to the absolute path
"f:\dokument\spel 5\demo\data\scenes\credits\op_cred_00\op_cred_00.jpg"

Appears to fix bug #7067.

Changed paths:
    engines/wintermute/base/file/base_disk_file.cpp



diff --git a/engines/wintermute/base/file/base_disk_file.cpp b/engines/wintermute/base/file/base_disk_file.cpp
index 82a9e24..b474c06 100644
--- a/engines/wintermute/base/file/base_disk_file.cpp
+++ b/engines/wintermute/base/file/base_disk_file.cpp
@@ -119,6 +119,8 @@ Common::SeekableReadStream *openDiskFile(const Common::String &filename) {
 			fixedFilename = filename.c_str() + 14;
 		} else if (fixedFilename.hasPrefix("c:/carol6/svn/data/")) {	// Carol Reed 6: Black Circle refers to "c:\carol6\svn\data\sprites\system\help.png"
 			fixedFilename = fixedFilename.c_str() + 19;
+		} else if (fixedFilename.hasPrefix("f:/dokument/spel 5/demo/data/")) { // Carol Reed 5 (non-demo) refers to "f:\dokument\spel 5\demo\data\scenes\credits\op_cred_00\op_cred_00.jpg"
+			fixedFilename = fixedFilename.c_str() + 29;
 		} else {
 			error("openDiskFile::Absolute path or invalid filename used in %s", filename.c_str());
 		}


Commit: fc3f6fa13ecaeb75cb0eff41f48eadafe4493740
    https://github.com/scummvm/scummvm/commit/fc3f6fa13ecaeb75cb0eff41f48eadafe4493740
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2016-03-06T01:34:34+01:00

Commit Message:
Merge pull request #695 from tobiatesan/fix_7067_a

WINTERMUTE: Add workaround for bug #7067

Changed paths:
    engines/wintermute/base/file/base_disk_file.cpp