[Scummvm-git-logs] scummvm master -> 752c9ef2821ba36f8ad7cc93201a34bf560fa6f6

[mduggan]

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

Summary:
700dd9958a TETRAEDGE: Fix Amerzone drag a bit
69e43575d4 TETRAEDGE: Fix font file loaded in Amerzone
752c9ef282 TETRAEDGE: Remember original path when loading images


Commit: 700dd9958ae52052bfd4b954bd049353ca40be21
    https://github.com/scummvm/scummvm/commit/700dd9958ae52052bfd4b954bd049353ca40be21
Author: Matthew Duggan (mgithub at guarana.org)
Date: 2025-04-19T15:13:00+10:00

Commit Message:
TETRAEDGE: Fix Amerzone drag a bit

Changed paths:
    engines/tetraedge/game/amerzone_game.cpp


diff --git a/engines/tetraedge/game/amerzone_game.cpp b/engines/tetraedge/game/amerzone_game.cpp
index 4a5a8d9e126..f0d6404e221 100644
--- a/engines/tetraedge/game/amerzone_game.cpp
+++ b/engines/tetraedge/game/amerzone_game.cpp
@@ -186,7 +186,10 @@ void AmerzoneGame::enter() {
 
 	TeInputMgr *inputMgr = g_engine->getInputMgr();
 	inputMgr->_mouseMoveSignal.add(this, &AmerzoneGame::onMouseMove);
-	inputMgr->_mouseLUpSignal.add(this, &AmerzoneGame::onMouseLeftUp);
+	// Left up should be max priority to make sure drags are always finished even if event
+	// is over button.
+	inputMgr->_mouseLUpSignal.push_back(TeICallback1ParamPtr<const Common::Point &>(new TeCallback1Param<AmerzoneGame,
+			const Common::Point &>(this, &AmerzoneGame::onMouseLeftUp, FLT_MAX)));
 	inputMgr->_mouseLDownSignal.add(this, &AmerzoneGame::onMouseLeftDown);
 
 	_orientationX = 0;


Commit: 69e43575d412078848e2003c2119e522e556f9ea
    https://github.com/scummvm/scummvm/commit/69e43575d412078848e2003c2119e522e556f9ea
Author: Matthew Duggan (mgithub at guarana.org)
Date: 2025-04-19T15:13:28+10:00

Commit Message:
TETRAEDGE: Fix font file loaded in Amerzone

This font is probably never used, but at least use the correct file to avoid
warning.

Changed paths:
    engines/tetraedge/game/document.cpp


diff --git a/engines/tetraedge/game/document.cpp b/engines/tetraedge/game/document.cpp
index a0457cb393c..60feaaab70e 100644
--- a/engines/tetraedge/game/document.cpp
+++ b/engines/tetraedge/game/document.cpp
@@ -43,7 +43,15 @@ void Document::load(const Common::String &name) {
 	TeITextLayout *txtLayout = _gui.textLayout("text");
 	if (!txtLayout)
 		error("can't find text layout in document");
-	Common::String header("<section style=\"center\" /><color r=\"255\" g=\"255\" b=\"255\"/><font file=\"Common/Fonts/arial.ttf\" size=\"16\" />");
+
+	const char *fontFile;
+	if (g_engine->gameIsAmerzone())
+		fontFile = "Arial_r_16.tef";
+	else
+		fontFile = "arial.ttf";
+
+	Common::String header = Common::String::format(
+		"<section style=\"center\" /><color r=\"255\" g=\"255\" b=\"255\"/><font file=\"Common/Fonts/%s\" />", fontFile);
 	txtLayout->setText(header + _browser->documentName(name));
 }
 


Commit: 752c9ef2821ba36f8ad7cc93201a34bf560fa6f6
    https://github.com/scummvm/scummvm/commit/752c9ef2821ba36f8ad7cc93201a34bf560fa6f6
Author: Matthew Duggan (mgithub at guarana.org)
Date: 2025-04-19T15:14:01+10:00

Commit Message:
TETRAEDGE: Remember original path when loading images

This is required to make the Amerzone "animated png" format work.

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 6e6e450eb3b..5c724ad5af3 100644
--- a/engines/tetraedge/te/te_core.cpp
+++ b/engines/tetraedge/te/te_core.cpp
@@ -95,8 +95,12 @@ TeICodec *TeCore::createVideoCodec(const Common::String &extn) {
 	return nullptr;
 }
 
-TeICodec *TeCore::createVideoCodec(const TetraedgeFSNode &node) {
-	const Common::String filename = node.getPath().baseName();
+TeICodec *TeCore::createVideoCodec(const TetraedgeFSNode &node, const Common::Path &origPath) {
+	//
+	// Need to use the original requested path (not the node path) as
+	// it might include the #anim directive for animated pngs.
+	//
+	const Common::String filename = origPath.baseName();
 	if (!filename.contains('.'))
 		return nullptr;
 	Common::String extn = filename.substr(filename.findLastOf('.') + 1);
diff --git a/engines/tetraedge/te/te_core.h b/engines/tetraedge/te/te_core.h
index 1008b4e06c8..0762e0685e7 100644
--- a/engines/tetraedge/te/te_core.h
+++ b/engines/tetraedge/te/te_core.h
@@ -40,7 +40,7 @@ public:
 
 	void addLoc(TeILoc *loc);
 	void create();
-	TeICodec *createVideoCodec(const TetraedgeFSNode &node);
+	TeICodec *createVideoCodec(const TetraedgeFSNode &node, const Common::Path &origPath);
 	TeICodec *createVideoCodec(const Common::String &extn);
 	const Common::String &fileFlagSystemFlag(const Common::String &name) const;
 	bool fileFlagSystemFlagsContains(const Common::String &name) const;
diff --git a/engines/tetraedge/te/te_image.cpp b/engines/tetraedge/te/te_image.cpp
index f3a77f789cd..3b6157deec3 100644
--- a/engines/tetraedge/te/te_image.cpp
+++ b/engines/tetraedge/te/te_image.cpp
@@ -103,7 +103,7 @@ bool TeImage::isExtensionSupported(const Common::Path &path) {
 
 bool TeImage::load(const TetraedgeFSNode &node) {
 	TeCore *core = g_engine->getCore();
-	TeICodec *codec = core->createVideoCodec(node);
+	TeICodec *codec = core->createVideoCodec(node, node.getPath());
 	if (!node.exists() || !codec->load(node)) {
 		warning("TeImage::load: Failed to load %s.", node.toString().c_str());
 		delete codec;
diff --git a/engines/tetraedge/te/te_tiled_surface.cpp b/engines/tetraedge/te/te_tiled_surface.cpp
index 0475cc7a9ed..a19118a4461 100644
--- a/engines/tetraedge/te/te_tiled_surface.cpp
+++ b/engines/tetraedge/te/te_tiled_surface.cpp
@@ -76,7 +76,7 @@ bool TeTiledSurface::load(const TetraedgeFSNode &node) {
 
 	if (!texture) {
 		TeCore *core = g_engine->getCore();
-		_codec = core->createVideoCodec(node);
+		_codec = core->createVideoCodec(node, _loadedPath);
 		if (!_codec)
 			return false;