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

[mduggan]

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:
ca7228fae0 TETRAEDGE: Fix path usage for videos.


Commit: ca7228fae05ed702048adb8274d0abecc8163757
    https://github.com/scummvm/scummvm/commit/ca7228fae05ed702048adb8274d0abecc8163757
Author: Matthew Duggan (mgithub at guarana.org)
Date: 2023-02-05T19:24:08+09:00

Commit Message:
TETRAEDGE: Fix path usage for videos.

The game should now be pretty playable in Windows.

Changed paths:
    engines/tetraedge/te/te_core.cpp
    engines/tetraedge/te/te_core.h
    engines/tetraedge/te/te_image.cpp
    engines/tetraedge/te/te_tiled_surface.cpp


diff --git a/engines/tetraedge/te/te_core.cpp b/engines/tetraedge/te/te_core.cpp
index 638a47e341d..94a480e5564 100644
--- a/engines/tetraedge/te/te_core.cpp
+++ b/engines/tetraedge/te/te_core.cpp
@@ -53,8 +53,8 @@ void TeCore::create() {
 	warning("TODO: TeCore::create: Finish implementing me.");
 }
 
-TeICodec *TeCore::createVideoCodec(const Common::Path &path) {
-	const Common::String filename = path.getLastComponent().toString();
+TeICodec *TeCore::createVideoCodec(const Common::FSNode &node) {
+	const Common::String filename = node.getName();
 	if (!filename.contains('.'))
 		return nullptr;
 	Common::String extn = filename.substr(filename.findFirstOf('.') + 1);
@@ -72,7 +72,7 @@ TeICodec *TeCore::createVideoCodec(const Common::Path &path) {
 	} else if (TeImagesSequence::matchExtension(extn)) {
 		return new TeImagesSequence();
 	}
-	error("TTeCore::createVideoCodec: Unrecognised format %s", path.toString().c_str());
+	error("TTeCore::createVideoCodec: Unrecognised format %s", node.getName().c_str());
 }
 
 const Common::String &TeCore::fileFlagSystemFlag(const Common::String &name) const {
diff --git a/engines/tetraedge/te/te_core.h b/engines/tetraedge/te/te_core.h
index 431ff9743c8..9a055534df7 100644
--- a/engines/tetraedge/te/te_core.h
+++ b/engines/tetraedge/te/te_core.h
@@ -41,7 +41,7 @@ public:
 	void addLoc(TeILoc *loc);
 	//void args(int argc, char **argv); // Probably not needed
 	void create();
-	TeICodec *createVideoCodec(const Common::Path &path);
+	TeICodec *createVideoCodec(const Common::FSNode &node);
 	const Common::String &fileFlagSystemFlag(const Common::String &name) const;
 	bool fileFlagSystemFlagsContains(const Common::String &name) const;
 	Common::Array<Common::String> fileFlagSystemPossibleFlags();
diff --git a/engines/tetraedge/te/te_image.cpp b/engines/tetraedge/te/te_image.cpp
index b598d93e42b..3b7e3c75eb3 100644
--- a/engines/tetraedge/te/te_image.cpp
+++ b/engines/tetraedge/te/te_image.cpp
@@ -94,7 +94,7 @@ bool TeImage::isExtensionSupported(const Common::Path &path) {
 
 bool TeImage::load(const Common::FSNode &node) {
 	TeCore *core = g_engine->getCore();
-	TeICodec *codec = core->createVideoCodec(node.getPath());
+	TeICodec *codec = core->createVideoCodec(node);
 	if (!node.isReadable() || !codec->load(node)) {
 		warning("TeImage::load: Failed to load %s.", node.getPath().c_str());
 		delete codec;
diff --git a/engines/tetraedge/te/te_tiled_surface.cpp b/engines/tetraedge/te/te_tiled_surface.cpp
index c865f9763ea..51180abb89a 100644
--- a/engines/tetraedge/te/te_tiled_surface.cpp
+++ b/engines/tetraedge/te/te_tiled_surface.cpp
@@ -74,7 +74,7 @@ bool TeTiledSurface::load(const Common::FSNode &node) {
 
 	if (!texture) {
 		TeCore *core = g_engine->getCore();
-		_codec = core->createVideoCodec(_loadedPath);
+		_codec = core->createVideoCodec(node);
 		if (!_codec)
 			return false;