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

[aquadran]

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:
f085fe68d4 WINTERMUTE: Small sync with original code


Commit: f085fe68d4ed840c81628f6bb513f69bda12944c
    https://github.com/scummvm/scummvm/commit/f085fe68d4ed840c81628f6bb513f69bda12944c
Author: Paweł Kołodziejski (aquadran at gmail.com)
Date: 2024-10-19T22:12:40+02:00

Commit Message:
WINTERMUTE: Small sync with original code

Changed paths:
    engines/wintermute/ad/ad_geom_ext_node.cpp
    engines/wintermute/ad/ad_walkplane.cpp
    engines/wintermute/base/gfx/base_renderer3d.cpp


diff --git a/engines/wintermute/ad/ad_geom_ext_node.cpp b/engines/wintermute/ad/ad_geom_ext_node.cpp
index 58873ec749c..8e53cc1e8ef 100644
--- a/engines/wintermute/ad/ad_geom_ext_node.cpp
+++ b/engines/wintermute/ad/ad_geom_ext_node.cpp
@@ -44,6 +44,7 @@ AdGeomExtNode::AdGeomExtNode(BaseGame *inGame) : BaseClass(inGame) {
 //////////////////////////////////////////////////////////////////////////
 AdGeomExtNode::~AdGeomExtNode() {
 	delete[] _namePattern;
+	_namePattern = nullptr;
 }
 
 TOKEN_DEF_START
diff --git a/engines/wintermute/ad/ad_walkplane.cpp b/engines/wintermute/ad/ad_walkplane.cpp
index 513de990c6c..41a8c8abfcb 100644
--- a/engines/wintermute/ad/ad_walkplane.cpp
+++ b/engines/wintermute/ad/ad_walkplane.cpp
@@ -41,6 +41,7 @@ AdWalkplane::AdWalkplane(BaseGame *inGame) : BaseScriptable(inGame, false, false
 //////////////////////////////////////////////////////////////////////////
 AdWalkplane::~AdWalkplane() {
 	delete _mesh;
+	_mesh = nullptr;
 }
 
 //////////////////////////////////////////////////////////////////////////
diff --git a/engines/wintermute/base/gfx/base_renderer3d.cpp b/engines/wintermute/base/gfx/base_renderer3d.cpp
index 3f9fbacaa49..968fabb58bd 100644
--- a/engines/wintermute/base/gfx/base_renderer3d.cpp
+++ b/engines/wintermute/base/gfx/base_renderer3d.cpp
@@ -63,6 +63,11 @@ bool BaseRenderer3D::getProjectionParams(float *resWidth, float *resHeight, floa
 	*resWidth = _width;
 	*resHeight = _height;
 
+	if (_gameRef->_editorResolutionWidth > 0)
+		*resWidth = _gameRef->_editorResolutionWidth;
+	if (_gameRef->_editorResolutionHeight > 0)
+		*resHeight = _gameRef->_editorResolutionHeight;
+
 	int lWidth, lHeight;
 	Rect32 sceneViewport;
 	_gameRef->getLayerSize(&lWidth, &lHeight, &sceneViewport, customViewport);
@@ -87,9 +92,14 @@ bool BaseRenderer3D::getProjectionParams(float *resWidth, float *resHeight, floa
 	return true;
 }
 
+void BaseRenderer3D::fade(uint16 alpha) {
+	fadeToColor(0, 0, 0, (byte)(255 - alpha));
+}
+
 bool BaseRenderer3D::setAmbientLightColor(uint32 color) {
 	_ambientLightColor = color;
 	_ambientLightOverride = true;
+
 	setAmbientLightRenderState();
 	return true;
 }
@@ -97,6 +107,7 @@ bool BaseRenderer3D::setAmbientLightColor(uint32 color) {
 bool BaseRenderer3D::setDefaultAmbientLightColor() {
 	_ambientLightColor = 0x00000000;
 	_ambientLightOverride = false;
+
 	setAmbientLightRenderState();
 	return true;
 }
@@ -109,10 +120,6 @@ Graphics::PixelFormat BaseRenderer3D::getPixelFormat() const {
 	return g_system->getScreenFormat();
 }
 
-void BaseRenderer3D::fade(uint16 alpha) {
-	fadeToColor(0, 0, 0, (byte)(255 - alpha));
-}
-
 Math::Matrix3 BaseRenderer3D::build2dTransformation(const Vector2 &center, float angle) {
 	Math::Matrix3 translateCenter;
 	translateCenter.setToIdentity();