[Scummvm-git-logs] scummvm master -> 17a0c415ad367eacdfffd3ea7f4f10d3f3eb5251

[djsrv]

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:
17a0c415ad DIRECTOR: LINGO: Make kThePathName mac style


Commit: 17a0c415ad367eacdfffd3ea7f4f10d3f3eb5251
    https://github.com/scummvm/scummvm/commit/17a0c415ad367eacdfffd3ea7f4f10d3f3eb5251
Author: djsrv (dservilla at gmail.com)
Date: 2020-08-05T14:14:18-04:00

Commit Message:
DIRECTOR: LINGO: Make kThePathName mac style

Changed paths:
    engines/director/lingo/lingo-the.cpp
    engines/director/util.cpp
    engines/director/util.h


diff --git a/engines/director/lingo/lingo-the.cpp b/engines/director/lingo/lingo-the.cpp
index 9bebc592ab..d3b6aea308 100644
--- a/engines/director/lingo/lingo-the.cpp
+++ b/engines/director/lingo/lingo-the.cpp
@@ -632,7 +632,7 @@ Datum Lingo::getTheEntity(int entity, Datum &id, int field) {
 	case kTheMoviePath:
 	case kThePathName:
 		d.type = STRING;
-		d.u.s = new Common::String(_vm->getCurrentPath());
+		d.u.s = new Common::String(unixToMacPath(_vm->getCurrentPath()));
 		break;
 	case kTheMultiSound:
 		// We always support multiple sound channels!
diff --git a/engines/director/util.cpp b/engines/director/util.cpp
index 97726c2661..141ae51a3e 100644
--- a/engines/director/util.cpp
+++ b/engines/director/util.cpp
@@ -283,6 +283,19 @@ Common::String convertPath(Common::String &path) {
 	return res1;
 }
 
+Common::String unixToMacPath(const Common::String &path) {
+	Common::String res;
+	for (uint32 idx = 0; idx < path.size(); idx++) {
+		if (path[idx] == ':')
+			res += '/';
+		else if (path[idx] == '/')
+			res += ':';
+		else
+			res += path[idx];
+	}
+	return res;
+}
+
 Common::String getPath(Common::String path, Common::String cwd) {
 	const char *s;
 	if ((s = strrchr(path.c_str(), '/'))) {
diff --git a/engines/director/util.h b/engines/director/util.h
index e12c67bee8..1a599a94a7 100644
--- a/engines/director/util.h
+++ b/engines/director/util.h
@@ -36,6 +36,8 @@ Common::String toLowercaseMac(const Common::String &s);
 
 Common::String convertPath(Common::String &path);
 
+Common::String unixToMacPath(const Common::String &path);
+
 Common::String getPath(Common::String path, Common::String cwd);
 
 bool testPath(Common::String &path, bool directory = false);