[Scummvm-git-logs] scummvm master -> 620e1b98d9a22c99229f648e5b6e132f16d7c68a

[neuromancer]

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

Summary:
711a00856b HYPNO: fix memory leak of boxes image in boyz
ad99a2e8f8 HYPNO: correctly set flashback mode when loading a previous game in boyz
048d265d09 HYPNO: fix memory leak of screen image in boyz
83d0c17ca9 HYPNO: fix memory leak of screen image in boyz
620e1b98d9 HYPNO: fix memory leak of stats image in boyz


Commit: 711a00856b780aec6bb09aa3f3613f8dd3872a3d
    https://github.com/scummvm/scummvm/commit/711a00856b780aec6bb09aa3f3613f8dd3872a3d
Author: neuromancer (gustavo.grieco at gmail.com)
Date: 2022-06-13T12:33:47+02:00

Commit Message:
HYPNO: fix memory leak of boxes image in boyz

Changed paths:
    engines/hypno/boyz/arcade.cpp


diff --git a/engines/hypno/boyz/arcade.cpp b/engines/hypno/boyz/arcade.cpp
index 7283d75f3d9..c8fdf70c2f1 100644
--- a/engines/hypno/boyz/arcade.cpp
+++ b/engines/hypno/boyz/arcade.cpp
@@ -303,6 +303,8 @@ bool BoyzEngine::checkTransition(ArcadeTransitions &transitions, ArcadeShooting
 					Graphics::Surface *boxes = frame->convertTo(frame->format, _background->decoder->getPalette());
 					drawImage(*boxes, 0, 0, false);
 					drawScreen();
+					boxes->free();
+					delete boxes;
 					_selectedCorrectBox = pickABox();
 					if (_selectedCorrectBox == 1) {
 						_background->decoder->forceSeekToFrame(582);


Commit: ad99a2e8f8e2efc2f412e11039f9800c8e0eddb8
    https://github.com/scummvm/scummvm/commit/ad99a2e8f8e2efc2f412e11039f9800c8e0eddb8
Author: neuromancer (gustavo.grieco at gmail.com)
Date: 2022-06-13T12:33:47+02:00

Commit Message:
HYPNO: correctly set flashback mode when loading a previous game in boyz

Changed paths:
    engines/hypno/boyz/boyz.cpp


diff --git a/engines/hypno/boyz/boyz.cpp b/engines/hypno/boyz/boyz.cpp
index 19e5078f7e9..f704d6efb61 100644
--- a/engines/hypno/boyz/boyz.cpp
+++ b/engines/hypno/boyz/boyz.cpp
@@ -1074,6 +1074,7 @@ Common::Error BoyzEngine::loadGameStream(Common::SeekableReadStream *stream) {
 	loadSceneState(stream);
 	if (_unlockAllLevels) {
 		_nextLevel = "<select_t1>";
+		_flashbackMode = true;
 		unlockAllLevels();
 	} else if (_ids[_lastLevel] == 3591)
 		_nextLevel = "<select_c3>";


Commit: 048d265d098d504e5a0f3d4386d508f1eda9411c
    https://github.com/scummvm/scummvm/commit/048d265d098d504e5a0f3d4386d508f1eda9411c
Author: neuromancer (gustavo.grieco at gmail.com)
Date: 2022-06-13T12:33:47+02:00

Commit Message:
HYPNO: fix memory leak of screen image in boyz

Changed paths:
    engines/hypno/boyz/arcade.cpp


diff --git a/engines/hypno/boyz/arcade.cpp b/engines/hypno/boyz/arcade.cpp
index c8fdf70c2f1..7fc5487af08 100644
--- a/engines/hypno/boyz/arcade.cpp
+++ b/engines/hypno/boyz/arcade.cpp
@@ -429,6 +429,8 @@ char BoyzEngine::selectDirection() {
 		drawScreen();
 		g_system->delayMillis(10);
 	}
+	screen->free();
+	delete screen;
 	return 0;
 }
 


Commit: 83d0c17ca90a2ddc55a5183eca99b45e3c34f644
    https://github.com/scummvm/scummvm/commit/83d0c17ca90a2ddc55a5183eca99b45e3c34f644
Author: neuromancer (gustavo.grieco at gmail.com)
Date: 2022-06-13T12:33:47+02:00

Commit Message:
HYPNO: fix memory leak of screen image in boyz

Changed paths:
    engines/hypno/boyz/arcade.cpp


diff --git a/engines/hypno/boyz/arcade.cpp b/engines/hypno/boyz/arcade.cpp
index 7fc5487af08..16c36974816 100644
--- a/engines/hypno/boyz/arcade.cpp
+++ b/engines/hypno/boyz/arcade.cpp
@@ -417,9 +417,14 @@ char BoyzEngine::selectDirection() {
 						}
 						viewingMap = !viewingMap;
 					} else if (!viewingMap && mousePos.x <= _screenH / 2) {
+						screen->free();
+						delete screen;
 						return 'L';
-					} else if (!viewingMap)
+					} else if (!viewingMap) {
+						screen->free();
+						delete screen;
 						return 'R';
+					}
 					break;
 
 				default:


Commit: 620e1b98d9a22c99229f648e5b6e132f16d7c68a
    https://github.com/scummvm/scummvm/commit/620e1b98d9a22c99229f648e5b6e132f16d7c68a
Author: neuromancer (gustavo.grieco at gmail.com)
Date: 2022-06-13T12:33:47+02:00

Commit Message:
HYPNO: fix memory leak of stats image in boyz

Changed paths:
    engines/hypno/boyz/arcade.cpp


diff --git a/engines/hypno/boyz/arcade.cpp b/engines/hypno/boyz/arcade.cpp
index 16c36974816..ac4cbe9b74d 100644
--- a/engines/hypno/boyz/arcade.cpp
+++ b/engines/hypno/boyz/arcade.cpp
@@ -107,6 +107,8 @@ void BoyzEngine::runAfterArcade(ArcadeShooting *arc) {
 		Graphics::Surface *stats = decodeFrame("preload/stats.smk", territory, &palette);
 		loadPalette(palette, 0, 256);
 		drawImage(*stats, 0, 0, true);
+		stats->free();
+		delete stats;
 		uint32 enemyAvailable = _stats.targetsDestroyed + _stats.targetsMissed;
 		drawString("scifi08.fgx", Common::String::format("%d", enemyAvailable), 240, 40, 0, kHypnoColorWhiteOrBlue);
 		drawString("scifi08.fgx", Common::String::format("%d%%", 100 * _stats.targetsDestroyed / enemyAvailable), 240, 54, 0, kHypnoColorWhiteOrBlue);