[Scummvm-git-logs] scummvm master -> 645230091f29ddcb73474cd820581e5f739afa15

mduggan noreply at scummvm.org
Fri Sep 8 10:43:54 UTC 2023


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:
645230091f TETRAEDGE: Fix missing scene object textures.


Commit: 645230091f29ddcb73474cd820581e5f739afa15
    https://github.com/scummvm/scummvm/commit/645230091f29ddcb73474cd820581e5f739afa15
Author: Joseph Davies (deledrius at gmail.com)
Date: 2023-09-08T19:43:49+09:00

Commit Message:
TETRAEDGE: Fix missing scene object textures.

Fixes missing textures caused by empty path returned from
Common::Path::getParent().

https://bugs.scummvm.org/ticket/14418

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


diff --git a/engines/tetraedge/game/in_game_scene.cpp b/engines/tetraedge/game/in_game_scene.cpp
index 7ce9cf00156..b0204e6ce2d 100644
--- a/engines/tetraedge/game/in_game_scene.cpp
+++ b/engines/tetraedge/game/in_game_scene.cpp
@@ -688,7 +688,7 @@ bool InGameScene::load(const Common::FSNode &sceneNode) {
 		return false;
 
 	close();
-	_loadedPath = sceneNode.getPath();
+	_loadedPath = sceneNode.getParent().getPath();
 	Common::File scenefile;
 	if (!scenefile.open(sceneNode))
 		return false;
@@ -1026,7 +1026,7 @@ bool InGameScene::loadObjectMaterials(const Common::String &name) {
 		if (obj._name.empty())
 			continue;
 
-		Common::Path mpath = _loadedPath.getParent().join(name).join(obj._name + ".png");
+		Common::Path mpath = _loadedPath.join(name).join(obj._name + ".png");
 		if (img.load(core->findFile(mpath))) {
 			Te3DTexture *tex = Te3DTexture::makeInstance();
 			tex->load(img);




More information about the Scummvm-git-logs mailing list