[Scummvm-git-logs] scummvm master -> 45dc2db9c0a8440ca4ecf5e451603da7ddb5e199

[mikrosk]

This automated email contains information about 2 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
4e285bdd0b BACKENDS: ATARI: Fix build
45dc2db9c0 SWORD1: Fix build


Commit: 4e285bdd0b82f5062cee9388c4bdd209dcfb18ef
    https://github.com/scummvm/scummvm/commit/4e285bdd0b82f5062cee9388c4bdd209dcfb18ef
Author: Miro Kropacek ()
Date: 2024-01-01T17:26:22+01:00

Commit Message:
BACKENDS: ATARI: Fix build

Changed paths:
    backends/platform/atari/osystem_atari.cpp


diff --git a/backends/platform/atari/osystem_atari.cpp b/backends/platform/atari/osystem_atari.cpp
index da6820089da..e1cb98cfad9 100644
--- a/backends/platform/atari/osystem_atari.cpp
+++ b/backends/platform/atari/osystem_atari.cpp
@@ -398,12 +398,12 @@ void OSystem_Atari::logMessage(LogMessageType::Type type, const char *message) {
 
 void OSystem_Atari::addSysArchivesToSearchSet(Common::SearchSet &s, int priority) {
 	{
-		Common::FSDirectory currentDirectory{ getFilesystemFactory()->makeCurrentDirectoryFileNode()->getPath() };
+		Common::FSDirectory currentDirectory{ Common::Path(getFilesystemFactory()->makeCurrentDirectoryFileNode()->getPath()) };
 		Common::FSDirectory *dataDirectory = currentDirectory.getSubDirectory("data");
 		if (dataDirectory) {
 			Common::FSNode dataNode = dataDirectory->getFSNode();
 			if (dataNode.exists() && dataNode.isDirectory() && dataNode.isReadable()) {
-				s.addDirectory(dataNode.getPath(), dataNode, priority);
+				s.addDirectory(dataNode.getPath(), priority);
 			}
 		}
 	}
@@ -425,7 +425,7 @@ Common::Path OSystem_Atari::getDefaultConfigFileName() {
 	const char *envVar = getenv("HOME");
 	if (envVar && *envVar) {
 		Common::Path configFile(envVar);
-		confgFile.joinInPlace(baseConfigName);
+		configFile.joinInPlace(baseConfigName);
 
 		if (configFile.toString(Common::Path::kNativeSeparator).size() < MAXPATHLEN)
 			return configFile;


Commit: 45dc2db9c0a8440ca4ecf5e451603da7ddb5e199
    https://github.com/scummvm/scummvm/commit/45dc2db9c0a8440ca4ecf5e451603da7ddb5e199
Author: Miro Kropacek ()
Date: 2024-01-01T17:26:22+01:00

Commit Message:
SWORD1: Fix build

Changed paths:
    engines/sword1/animation.cpp


diff --git a/engines/sword1/animation.cpp b/engines/sword1/animation.cpp
index 02d8cc1b120..4bab868e359 100644
--- a/engines/sword1/animation.cpp
+++ b/engines/sword1/animation.cpp
@@ -529,7 +529,7 @@ MoviePlayer *makeMoviePlayer(uint32 id, SwordEngine *vm, Text *textMan, ResMan *
 			Video::VideoDecoder *psxDecoder = new Video::PSXStreamDecoder(Video::PSXStreamDecoder::kCD2x);
 			return new MoviePlayer(vm, textMan, resMan, sound, system, psxDecoder, kVideoDecoderPSX);
 #else
-			GUI::MessageDialog dialog(Common::U32String::format(_("PSX stream cutscene '%s' cannot be played in paletted mode"), filename.c_str()), _("OK"));
+			GUI::MessageDialog dialog(Common::U32String::format(_("PSX stream cutscene '%s' cannot be played in paletted mode"), filename.toString().c_str()), _("OK"));
 			dialog.runModal();
 			return 0;
 #endif