[Scummvm-git-logs] scummvm master -> cf9d7060afcb28d63e587acbe3153fa22cebbef5

sev- noreply at scummvm.org
Sat May 25 11:55:05 UTC 2024


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:
cf9d7060af DIRECTOR: Make absolute path coherent with path separator


Commit: cf9d7060afcb28d63e587acbe3153fa22cebbef5
    https://github.com/scummvm/scummvm/commit/cf9d7060afcb28d63e587acbe3153fa22cebbef5
Author: Le Philousophe (lephilousophe at users.noreply.github.com)
Date: 2024-05-25T13:55:01+02:00

Commit Message:
DIRECTOR: Make absolute path coherent with path separator

Path separator is set to \ only on director 4+ and Windows platform in
DirectorEngine constructor.
Don't use a \ separator in getCurrentAbsolutePath on versions older than
Director 4.

Changed paths:
    engines/director/director.cpp


diff --git a/engines/director/director.cpp b/engines/director/director.cpp
index 24bf25ddd91..218a6dc2d62 100644
--- a/engines/director/director.cpp
+++ b/engines/director/director.cpp
@@ -175,7 +175,7 @@ Common::String DirectorEngine::getCurrentPath() const { return _currentWindow->g
 Common::String DirectorEngine::getCurrentAbsolutePath() {
 	Common::String currentPath = getCurrentPath();
 	Common::String result;
-	result += (getPlatform() == Common::kPlatformWindows) ? "C:\\" : "";
+	result += (getPlatform() == Common::kPlatformWindows && _version >= 400) ? "C:\\" : "";
 	result += convertPath(currentPath);
 	return result;
 }




More information about the Scummvm-git-logs mailing list