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

[neuromancer]

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

Summary:
18feda3c9e HYPNO: fixes for extra ammo bar in some level of wet
d86a5bafd3 HYPNO: properly deallocate player frames and separators after arcade sequences in wet and spider


Commit: 18feda3c9e6a5b82296b7736d67bd69c044483b9
    https://github.com/scummvm/scummvm/commit/18feda3c9e6a5b82296b7736d67bd69c044483b9
Author: neuromancer (gustavo.grieco at gmail.com)
Date: 2022-05-03T12:37:23+02:00

Commit Message:
HYPNO: fixes for extra ammo bar in some level of wet

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


diff --git a/engines/hypno/wet/arcade.cpp b/engines/hypno/wet/arcade.cpp
index 2d0e55b11c4..89ed53ab59c 100644
--- a/engines/hypno/wet/arcade.cpp
+++ b/engines/hypno/wet/arcade.cpp
@@ -1035,6 +1035,11 @@ void WetEngine::drawAmmo() {
 	if (_levelId / 10 == 5 && _arcadeMode != "Y5") {
 		r = Common::Rect(p.x, p.y + d, p.x + 13, p.y + 13);
 		_compositeSurface->fillRect(r, kHypnoColorWhiteOrBlue); // blue
+
+		if (ao > 0) {
+			r = Common::Rect(p.x + ao, p.y + d, p.x + 13 + ao, p.y + 13);
+			_compositeSurface->fillRect(r, kHypnoColorWhiteOrBlue); // blue
+		}
 	} else {
 		r = Common::Rect(p.x, p.y + d, p.x + 15, p.y + 13);
 		_compositeSurface->fillRect(r, kHypnoColorWhiteOrBlue); // blue
@@ -1043,8 +1048,6 @@ void WetEngine::drawAmmo() {
 			r = Common::Rect(p.x + ao, p.y + d, p.x + 15 + ao, p.y + 13);
 			_compositeSurface->fillRect(r, kHypnoColorWhiteOrBlue); // blue
 		}
-
-
 	}
 }
 
diff --git a/engines/hypno/wet/wet.cpp b/engines/hypno/wet/wet.cpp
index e5cce59c462..7e8f469127c 100644
--- a/engines/hypno/wet/wet.cpp
+++ b/engines/hypno/wet/wet.cpp
@@ -43,8 +43,8 @@ static const chapterEntry rawChapterTable[] = {
 	{43, {70, 160}, {180, 160}, {220, 185}, {44, 162},  215, kHypnoColorRed}, 	// c43
 	{44, {70, 160}, {180, 160}, {220, 185}, {44, 162},  215, kHypnoColorRed}, 	// c44
 	{40, {19, 3},   {246, 3}, 	{246, 11},  {2, 2},     0, kHypnoColorRed}, 	// c40
-	{51, {60, 167}, {190, 167}, {135, 187}, {136, 163}, 35, kHypnoColorRed}, 	// c51
-	{52, {60, 167}, {190, 167}, {135, 187}, {136, 165}, 35, kHypnoColorCyan}, 	// c52
+	{51, {60, 167}, {190, 167}, {135, 187}, {136, 163}, 36, kHypnoColorRed}, 	// c51
+	{52, {60, 167}, {190, 167}, {135, 187}, {136, 165}, 36, kHypnoColorCyan}, 	// c52
 	{50, {19, 3},   {246, 3}, 	{246, 11},  {2, 2}, 	0, kHypnoColorRed}, 	// c50 (fixed)
 	{61, {63, 167}, {187, 167}, {192, 188}, {152, 185}, 0, kHypnoColorCyan}, 	// c61
 	{60, {63, 167}, {187, 167}, {192, 188}, {152, 185}, 0, kHypnoColorCyan}, 	// c60


Commit: d86a5bafd37c6f6f97cca0c4bb9ee386adb03c51
    https://github.com/scummvm/scummvm/commit/d86a5bafd37c6f6f97cca0c4bb9ee386adb03c51
Author: neuromancer (gustavo.grieco at gmail.com)
Date: 2022-05-03T15:42:10+02:00

Commit Message:
HYPNO: properly deallocate player frames and separators after arcade sequences in wet and spider

Changed paths:
    engines/hypno/spider/arcade.cpp
    engines/hypno/wet/arcade.cpp


diff --git a/engines/hypno/spider/arcade.cpp b/engines/hypno/spider/arcade.cpp
index 2890bfbcf78..e8731117679 100644
--- a/engines/hypno/spider/arcade.cpp
+++ b/engines/hypno/spider/arcade.cpp
@@ -64,6 +64,11 @@ void SpiderEngine::runAfterArcade(ArcadeShooting *arc) {
 		_score -= _bonus;
 	}
 
+	for (Frames::iterator it =_playerFrames.begin(); it != _playerFrames.end(); ++it) {
+		(*it)->free();
+		delete (*it);
+	}
+
 	if (isDemo() && _restoredContentEnabled) {
 		if (_health == 0)
 			showScore("Spider-man was defeated!");
diff --git a/engines/hypno/wet/arcade.cpp b/engines/hypno/wet/arcade.cpp
index 89ed53ab59c..6978786ea1d 100644
--- a/engines/hypno/wet/arcade.cpp
+++ b/engines/hypno/wet/arcade.cpp
@@ -367,6 +367,13 @@ bool WetEngine::checkTransition(ArcadeTransitions &transitions, ArcadeShooting *
 
 void WetEngine::runAfterArcade(ArcadeShooting *arc) {
 	_checkpoint = _currentLevel;
+
+	_playerFrameSeps.clear();
+	for (Frames::iterator it =_playerFrames.begin(); it != _playerFrames.end(); ++it) {
+		(*it)->free();
+		delete (*it);
+	}
+
 	if (_health < 0)
 		_health = 0;