[Scummvm-git-logs] scummvm master -> 5d96c699e4e8db019a3ee67f0d9c8b2ca1625636

aquadran noreply at scummvm.org
Mon Sep 22 17:32:29 UTC 2025


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

Summary:
5d96c699e4 WINTERMUTE: Small sync with original (coverity 1621116)


Commit: 5d96c699e4e8db019a3ee67f0d9c8b2ca1625636
    https://github.com/scummvm/scummvm/commit/5d96c699e4e8db019a3ee67f0d9c8b2ca1625636
Author: Paweł Kołodziejski (aquadran at gmail.com)
Date: 2025-09-22T19:32:23+02:00

Commit Message:
WINTERMUTE: Small sync with original (coverity 1621116)

Changed paths:
    engines/wintermute/ad/ad_actor_3dx.cpp
    engines/wintermute/base/gfx/3dloader_3ds.cpp


diff --git a/engines/wintermute/ad/ad_actor_3dx.cpp b/engines/wintermute/ad/ad_actor_3dx.cpp
index 260865e1c8d..b419fa39411 100644
--- a/engines/wintermute/ad/ad_actor_3dx.cpp
+++ b/engines/wintermute/ad/ad_actor_3dx.cpp
@@ -772,7 +772,7 @@ void AdActor3DX::getNextStep2D() {
 
 //////////////////////////////////////////////////////////////////////////
 void AdActor3DX::followPath2D() {
-	AdGame *adGameRef = (AdGame *)_game;
+	AdGame *adGame = (AdGame *)_game;
 
 	// skip current position
 	_path2D->getFirst();
@@ -790,7 +790,7 @@ void AdActor3DX::followPath2D() {
 		_state = STATE_FOLLOWING_PATH;
 
 		DXVector3 currentPoint;
-		adGameRef->_scene->_geom->convert2Dto3DTolerant(_path2D->getCurrent()->x, _path2D->getCurrent()->y, &currentPoint);
+		adGame->_scene->_geom->convert2Dto3DTolerant(_path2D->getCurrent()->x, _path2D->getCurrent()->y, &currentPoint);
 
 		initLine3D(_posVector, currentPoint, true);
 	} else {
diff --git a/engines/wintermute/base/gfx/3dloader_3ds.cpp b/engines/wintermute/base/gfx/3dloader_3ds.cpp
index b897e0b66af..a23e283f135 100644
--- a/engines/wintermute/base/gfx/3dloader_3ds.cpp
+++ b/engines/wintermute/base/gfx/3dloader_3ds.cpp
@@ -348,6 +348,8 @@ bool Loader3DS::parseFile(const char *filename) {
 			fileStream.seek(chunkLength - 6, SEEK_CUR);
 	}
 
+	SAFE_DELETE_ARRAY(keyframerObject);
+
 	delete[] buffer;
 
 	return true;




More information about the Scummvm-git-logs mailing list