[Scummvm-git-logs] scummvm master -> 7c13c3ce5129de36d2a94898a41dd36aee752cee

[mistydemeo]

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:
7c13c3ce51 DIRECTOR: Windows paths can begin with @


Commit: 7c13c3ce5129de36d2a94898a41dd36aee752cee
    https://github.com/scummvm/scummvm/commit/7c13c3ce5129de36d2a94898a41dd36aee752cee
Author: Misty De Meo (mistydemeo at gmail.com)
Date: 2023-06-07T16:39:14-07:00

Commit Message:
DIRECTOR: Windows paths can begin with @

Changed paths:
    engines/director/util.cpp


diff --git a/engines/director/util.cpp b/engines/director/util.cpp
index 7263382ed42..2185e48a320 100644
--- a/engines/director/util.cpp
+++ b/engines/director/util.cpp
@@ -444,7 +444,7 @@ const char *recIndent() {
 
 bool isAbsolutePath(Common::String &path) {
 	// Starts with Mac directory notation for the game root
-	if (path.hasPrefix("@:"))
+	if (path.hasPrefix(Common::String("@") + g_director->_dirSeparator))
 		return true;
 	// Starts with a Windows drive letter
 	if (path.size() >= 3
@@ -471,7 +471,7 @@ Common::String convertPath(Common::String &path) {
 
 	if (path.hasPrefix("::")) { // Parent directory
 		idx = 2;
-	} else if (path.hasPrefix("@:")) { // Root of the game
+	} else if (path.hasPrefix(Common::String("@") + g_director->_dirSeparator)) { // Root of the game
 		idx = 2;
 	} else if (path.size() >= 3
 					&& Common::isAlpha(path[0])