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

bluegr bluegr at gmail.com
Tue Oct 1 23:47:51 CEST 2013


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:
db5ff22410 WINTERMUTE: Handle invalid file access in Carol Reed 6: Black Circle


Commit: db5ff22410aa8d649b7c5afa443253526df62991
    https://github.com/scummvm/scummvm/commit/db5ff22410aa8d649b7c5afa443253526df62991
Author: Filippos Karapetis (bluegr at gmail.com)
Date: 2013-10-01T14:45:29-07:00

Commit Message:
WINTERMUTE: Handle invalid file access in Carol Reed 6: Black Circle

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 d15778c..808dc9e 100644
--- a/engines/wintermute/base/file/base_disk_file.cpp
+++ b/engines/wintermute/base/file/base_disk_file.cpp
@@ -117,6 +117,8 @@ Common::SeekableReadStream *openDiskFile(const Common::String &filename) {
 	if (fixedFilename.contains(':')) {
 		if (fixedFilename.hasPrefix("c:/windows/fonts/")) { // East Side Story refers to "c:\windows\fonts\framd.ttf"
 			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 {
 			error("openDiskFile::Absolute path or invalid filename used in %s", filename.c_str());
 		}






More information about the Scummvm-git-logs mailing list