From 891986fd2be496834ce5c8dc54f0dd09d3271f95 Mon Sep 17 00:00:00 2001
From: Tobia Tesan
Date: Sun, 6 Mar 2016 11:33:06 +0100
Subject: WINTERMUTE: Use C strings in absolute path workaround array

---
 engines/wintermute/base/file/base_disk_file.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'engines/wintermute')

diff --git a/engines/wintermute/base/file/base_disk_file.cpp b/engines/wintermute/base/file/base_disk_file.cpp
index 74ed7960a1..d0c51616f4 100644
--- a/engines/wintermute/base/file/base_disk_file.cpp
+++ b/engines/wintermute/base/file/base_disk_file.cpp
@@ -117,7 +117,7 @@ Common::SeekableReadStream *openDiskFile(const Common::String &filename) {
 	// The original interpreter on Windows usually simply ignores them when it can't find them.
 	// We try to turn the known ones into relative paths.
 	if (fixedFilename.contains(':')) {
-		Common::String knownPrefixes[] = { // Known absolute paths
+		const char* const knownPrefixes[] = { // Known absolute paths
 				"c:/windows/fonts/", // East Side Story refers to "c:\windows\fonts\framd.ttf"
 				"c:/carol6/svn/data/", // Carol Reed 6: Black Circle refers to "c:\carol6\svn\data\sprites\system\help.png"
 				"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"
@@ -127,7 +127,7 @@ Common::SeekableReadStream *openDiskFile(const Common::String &filename) {
 
 		for (uint i = 0; i < ARRAYSIZE(knownPrefixes); i++) {
 			if (fixedFilename.hasPrefix(knownPrefixes[i])) {
-				fixedFilename = filename.c_str() + knownPrefixes[i].size();
+				fixedFilename = fixedFilename.c_str() + strlen(knownPrefixes[i]);
 				matched = true;
 			}
 		}
-- 
cgit v1.2.3