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

[aquadran]

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


Commit: c037c91fa7920a927b017a9725993337e73c9563
    https://github.com/scummvm/scummvm/commit/c037c91fa7920a927b017a9725993337e73c9563
Author: Paweł Kołodziejski (aquadran at gmail.com)
Date: 2025-09-08T10:19:18+02:00

Commit Message:
WINTERMUTE: Small sync with original code

Changed paths:
    engines/wintermute/ad/ad_game.cpp
    engines/wintermute/ad/ad_response.cpp
    engines/wintermute/base/base_game.cpp
    engines/wintermute/base/base_object.cpp
    engines/wintermute/base/font/base_font_truetype.cpp
    engines/wintermute/base/scriptables/script_ext_string.cpp
    engines/wintermute/ui/ui_button.cpp


diff --git a/engines/wintermute/ad/ad_game.cpp b/engines/wintermute/ad/ad_game.cpp
index da4fe005547..ec931be87d3 100644
--- a/engines/wintermute/ad/ad_game.cpp
+++ b/engines/wintermute/ad/ad_game.cpp
@@ -2316,6 +2316,7 @@ bool AdGame::onMouseLeftDown() {
 		_game->_capturedObject = _game->_activeObject;
 	}
 	_mouseLeftDown = true;
+	//BasePlatform::setCapture(_renderer->_window);
 
 	return STATUS_OK;
 }
diff --git a/engines/wintermute/ad/ad_response.cpp b/engines/wintermute/ad/ad_response.cpp
index a308497c333..731616e46fe 100644
--- a/engines/wintermute/ad/ad_response.cpp
+++ b/engines/wintermute/ad/ad_response.cpp
@@ -69,7 +69,7 @@ void AdResponse::setText(const char *text) {
 
 //////////////////////////////////////////////////////////////////////////
 bool AdResponse::setIcon(const char *filename) {
-	delete _icon;
+	SAFE_DELETE(_icon);
 	_icon = new BaseSprite(_game);
 	if (!_icon || DID_FAIL(_icon->loadFile(filename))) {
 		_game->LOG(0, "AdResponse::setIcon failed for file '%s'", filename);
diff --git a/engines/wintermute/base/base_game.cpp b/engines/wintermute/base/base_game.cpp
index 6b4cd0356d8..f7abf639280 100644
--- a/engines/wintermute/base/base_game.cpp
+++ b/engines/wintermute/base/base_game.cpp
@@ -3174,17 +3174,6 @@ ScValue *BaseGame::scGetProperty(const char *name) {
 		return _scValue;
 	}
 
-	//////////////////////////////////////////////////////////////////////////
-	// MostRecentSaveSlot (RO)
-	//////////////////////////////////////////////////////////////////////////
-	else if (strcmp(name, "MostRecentSaveSlot") == 0) {
-		if (!ConfMan.hasKey("most_recent_saveslot")) {
-			_scValue->setInt(-1);
-		} else {
-			_scValue->setInt(ConfMan.getInt("most_recent_saveslot"));
-		}
-		return _scValue;
-	}
 
 	//////////////////////////////////////////////////////////////////////////
 	// AutoSaveOnExit
@@ -3347,6 +3336,18 @@ ScValue *BaseGame::scGetProperty(const char *name) {
 		return _scValue;
 	}
 
+	//////////////////////////////////////////////////////////////////////////
+	// MostRecentSaveSlot (RO)
+	//////////////////////////////////////////////////////////////////////////
+	else if (strcmp(name, "MostRecentSaveSlot") == 0) {
+		if (!ConfMan.hasKey("most_recent_saveslot")) {
+			_scValue->setInt(-1);
+		} else {
+			_scValue->setInt(ConfMan.getInt("most_recent_saveslot"));
+		}
+		return _scValue;
+	}
+
 	//////////////////////////////////////////////////////////////////////////
 	// Store (RO)
 	//////////////////////////////////////////////////////////////////////////
diff --git a/engines/wintermute/base/base_object.cpp b/engines/wintermute/base/base_object.cpp
index 93237ec2df0..807bf6a36ac 100644
--- a/engines/wintermute/base/base_object.cpp
+++ b/engines/wintermute/base/base_object.cpp
@@ -1228,7 +1228,7 @@ bool BaseObject::playSFX(const char *filename, bool looping, bool playNow, const
 	}
 
 	// create new sound
-	delete _sFX;
+	SAFE_DELETE(_sFX);
 
 	_sFX = new BaseSound(_game);
 	if (_sFX && DID_SUCCEED(_sFX->setSound(filename, Audio::Mixer::kSFXSoundType, true))) {
diff --git a/engines/wintermute/base/font/base_font_truetype.cpp b/engines/wintermute/base/font/base_font_truetype.cpp
index cf4acd699a9..54f583b4397 100644
--- a/engines/wintermute/base/font/base_font_truetype.cpp
+++ b/engines/wintermute/base/font/base_font_truetype.cpp
@@ -409,8 +409,7 @@ bool BaseFontTT::loadBuffer(char *buffer) {
 			if (layer && DID_SUCCEED(parseLayer(layer, params))) {
 				_layers.add(layer);
 			} else {
-				delete layer;
-				layer = nullptr;
+				SAFE_DELETE(layer);
 				cmd = PARSERR_TOKENNOTFOUND;
 			}
 		}
diff --git a/engines/wintermute/base/scriptables/script_ext_string.cpp b/engines/wintermute/base/scriptables/script_ext_string.cpp
index ff09cb81610..3ee93de608e 100644
--- a/engines/wintermute/base/scriptables/script_ext_string.cpp
+++ b/engines/wintermute/base/scriptables/script_ext_string.cpp
@@ -339,8 +339,7 @@ bool SXString::scCallMethod(ScScript *script, ScStack *stack, ScStack *thisStack
 			}
 
 			array->push(val);
-			delete val;
-			val = nullptr;
+			SAFE_DELETE(val);
 		}
 
 		stack->pushNative(array, false);
diff --git a/engines/wintermute/ui/ui_button.cpp b/engines/wintermute/ui/ui_button.cpp
index 30996e0d5bc..c66ea0c3128 100644
--- a/engines/wintermute/ui/ui_button.cpp
+++ b/engines/wintermute/ui/ui_button.cpp
@@ -887,7 +887,7 @@ bool UIButton::scCallMethod(ScScript *script, ScStack *stack, ScStack *thisStack
 	else if (strcmp(name, "SetDisabledImage") == 0) {
 		stack->correctParams(1);
 
-		delete _imageDisable;
+		SAFE_DELETE(_imageDisable);
 		_imageDisable = new BaseSprite(_game);
 		const char *filename = stack->pop()->getString();
 		if (!_imageDisable || DID_FAIL(_imageDisable->loadFile(filename))) {