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

[eriktorbjorn]

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:
d4c91352eb GRIM: Fix .ogv player regression... sort of


Commit: d4c91352ebf767014b905d6bf886f0f2e9c1d3b5
    https://github.com/scummvm/scummvm/commit/d4c91352ebf767014b905d6bf886f0f2e9c1d3b5
Author: Torbjörn Andersson (eriktorbjorn at users.sourceforge.net)
Date: 2024-02-10T10:35:37+01:00

Commit Message:
GRIM: Fix .ogv player regression... sort of

After discussing with lephilousophe, the .ogv player (used by the
remastered version of Grim Fandango) once again finds the movie it's
looking for. Unfortunately, the player doesn't work at all for me,
making the game less playable than before. But it's how 2.8 behaves, so
there's that.

Changed paths:
    engines/grim/movie/smush.cpp


diff --git a/engines/grim/movie/smush.cpp b/engines/grim/movie/smush.cpp
index a525f6caaab..8434e2427e5 100644
--- a/engines/grim/movie/smush.cpp
+++ b/engines/grim/movie/smush.cpp
@@ -60,15 +60,11 @@ bool SmushPlayer::loadFile(const Common::String &filename) {
 
 	if (!success) {
 #if defined (USE_THEORADEC)
-		Common::Path theoraFilename(filename);
-
-		Common::String baseName(theoraFilename.baseName());
+		Common::String baseName(filename);
 		baseName.erase(baseName.size() - 4);
 		baseName += ".ogv";
 
-		theoraFilename = "MoviesHD";
-		theoraFilename.join(theoraFilename.getParent());
-		theoraFilename.appendComponent(baseName);
+		Common::Path theoraFilename(Common::Path("MoviesHD").appendComponent(baseName));
 
 		debug(2, "Trying to open %s", theoraFilename.toString().c_str());
 		success = _theoraDecoder->loadFile(theoraFilename);