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

aquadran noreply at scummvm.org
Sat Jun 25 22:04:44 UTC 2022


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:
f4ff4b3940 WINTERMUTE: WME3D: Added missing deallocation, match with original


Commit: f4ff4b39403f723ba5a01b299c2764f033b103cf
    https://github.com/scummvm/scummvm/commit/f4ff4b39403f723ba5a01b299c2764f033b103cf
Author: Paweł Kołodziejski (aquadran at gmail.com)
Date: 2022-06-26T00:04:40+02:00

Commit Message:
WINTERMUTE: WME3D: Added missing deallocation, match with original

Changed paths:
    engines/wintermute/base/base_object.cpp


diff --git a/engines/wintermute/base/base_object.cpp b/engines/wintermute/base/base_object.cpp
index f06ba42a877..10cd3aed088 100644
--- a/engines/wintermute/base/base_object.cpp
+++ b/engines/wintermute/base/base_object.cpp
@@ -39,6 +39,7 @@
 #include "engines/wintermute/base/base_engine.h"
 #include "engines/wintermute/base/base_surface_storage.h"
 #include "engines/wintermute/base/gfx/base_surface.h"
+#include "engines/wintermute/base/gfx/x/modelx.h"
 #include "engines/wintermute/wintermute.h"
 #endif
 
@@ -151,6 +152,18 @@ bool BaseObject::cleanup() {
 		_caption[i] = nullptr;
 	}
 
+#ifdef ENABLE_WME3D
+	delete _modelX;
+	_modelX = nullptr;
+	delete _shadowModel;
+	_shadowModel = nullptr;
+
+	if (_shadowImage) {
+		_gameRef->_surfaceStorage->removeSurface(_shadowImage);
+		_shadowImage = nullptr;
+	}
+#endif
+
 	_sFXType = SFX_NONE;
 	_sFXParam1 = _sFXParam2 = _sFXParam3 = _sFXParam4 = 0;
 




More information about the Scummvm-git-logs mailing list