[Scummvm-git-logs] scummvm master -> 4ef256be5a89e7b9660aa12fa200c20e419e851f

lephilousophe noreply at scummvm.org
Sun Feb 2 10:57:45 UTC 2025


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:
4ef256be5a MACVENTURE: Handle case where subdirectory is empty


Commit: 4ef256be5a89e7b9660aa12fa200c20e419e851f
    https://github.com/scummvm/scummvm/commit/4ef256be5a89e7b9660aa12fa200c20e419e851f
Author: Le Philousophe (lephilousophe at users.noreply.github.com)
Date: 2025-02-02T11:57:31+01:00

Commit Message:
MACVENTURE: Handle case where subdirectory is empty

In this case, the path built had a leading /

Changed paths:
    engines/macventure/macventure.cpp


diff --git a/engines/macventure/macventure.cpp b/engines/macventure/macventure.cpp
index d42164111ac..ab43184b553 100644
--- a/engines/macventure/macventure.cpp
+++ b/engines/macventure/macventure.cpp
@@ -946,7 +946,9 @@ Common::Path MacVentureEngine::getFilePath(FilePathID id) const {
 	if (id <= 3) { // We don't want a file in the subdirectory
 		return Common::Path(_filenames->getString(id));
 	} else { // We want a game file
-		return Common::Path(_filenames->getString(3) + "/" + _filenames->getString(id));
+		Common::Path path(_filenames->getString(3));
+		path.joinInPlace(_filenames->getString(id));
+		return path;
 	}
 }
 




More information about the Scummvm-git-logs mailing list