[Scummvm-git-logs] scummvm master -> 794c07c05c7b22c05e0aba46aa6ed99e0ecfe866

[neuromancer]

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

Summary:
0ada4b693a HYPNO: boyz is in testing
ca858c2c43 HYPNO: missing hostage video in boyz
794c07c05c HYPNO: removed unused objectives from level c352 in boyz


Commit: 0ada4b693a73747eadea4571a3c41c77b01a700a
    https://github.com/scummvm/scummvm/commit/0ada4b693a73747eadea4571a3c41c77b01a700a
Author: neuromancer (gustavo.grieco at gmail.com)
Date: 2022-06-19T14:40:24+02:00

Commit Message:
HYPNO: boyz is in testing

Changed paths:
    engines/hypno/detection.cpp


diff --git a/engines/hypno/detection.cpp b/engines/hypno/detection.cpp
index 6518d606e96..53e91cc2738 100644
--- a/engines/hypno/detection.cpp
+++ b/engines/hypno/detection.cpp
@@ -219,7 +219,7 @@ static const ADGameDescription gameDescriptions[] = {
 					"setup.exe", "bac1d734f2606dbdd0816dfa7a5cf518", 160740),
 		Common::EN_USA,
 		Common::kPlatformDOS,
-		ADGF_UNSTABLE,
+		ADGF_TESTING,
 		GUIO1(GUIO_NOMIDI)
 	},
 	{


Commit: ca858c2c43b62850aa27111db083b96babcba19d
    https://github.com/scummvm/scummvm/commit/ca858c2c43b62850aa27111db083b96babcba19d
Author: neuromancer (gustavo.grieco at gmail.com)
Date: 2022-06-19T14:40:24+02:00

Commit Message:
HYPNO: missing hostage video in boyz

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


diff --git a/engines/hypno/boyz/arcade.cpp b/engines/hypno/boyz/arcade.cpp
index 6328091fe86..f8c595736df 100644
--- a/engines/hypno/boyz/arcade.cpp
+++ b/engines/hypno/boyz/arcade.cpp
@@ -329,6 +329,17 @@ bool BoyzEngine::checkTransition(ArcadeTransitions &transitions, ArcadeShooting
 			} else if (_levelId == 352) {
 				// Objectives are never checked here, for some reason
 				_skipLevel = true;
+			} else if (_levelId == 354) {
+				if (ttime == 70) {
+					incInfoReceived();
+					_background->decoder->pauseVideo(true);
+					MVideo video("tempdir/c35h4a1s.smk", Common::Point(0, 0), false, true, false);
+					disableCursor();
+					runIntro(video);
+					defaultCursor();
+					waitForUserClick(1);
+					_skipLevel = true;
+				}
 			} else if (_levelId == 51) {
 				if (_selectedCorrectBox == 0) {
 					_background->decoder->pauseVideo(true);
@@ -694,7 +705,7 @@ bool BoyzEngine::shoot(const Common::Point &mousePos, ArcadeShooting *arc, bool
 		if (!_shoots[i].deathSound.empty())
 			playSound(_soundPath + _shoots[i].deathSound, 1);
 
-		if (_shoots[i].playInteractionAudio) {
+		if (_shoots[i].playInteractionAudio && !arc->missBoss2Video.empty()) {
 			incInfoReceived();
 			_additionalVideo = new MVideo(arc->missBoss2Video, Common::Point(0, 0), true, false, false);
 			playVideo(*_additionalVideo);
@@ -743,7 +754,7 @@ void BoyzEngine::missedTarget(Shoot *s, ArcadeShooting *arc) {
 		_stats.targetsMissed--; // If the target was not hostile, it should *not* count as missed
 	}
 
-	if (s->name == "CAPTOR") {
+	if (s->name == "CAPTOR" || (s->name == "G1" && _currentLevel == "c354.mi_")) {
 		_background->decoder->pauseVideo(true);
 		MVideo video(_warningHostage, Common::Point(0, 0), false, true, false);
 		disableCursor();


Commit: 794c07c05c7b22c05e0aba46aa6ed99e0ecfe866
    https://github.com/scummvm/scummvm/commit/794c07c05c7b22c05e0aba46aa6ed99e0ecfe866
Author: neuromancer (gustavo.grieco at gmail.com)
Date: 2022-06-19T14:40:24+02:00

Commit Message:
HYPNO: removed unused objectives from level c352 in boyz

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


diff --git a/engines/hypno/boyz/arcade.cpp b/engines/hypno/boyz/arcade.cpp
index f8c595736df..a7dc4fd97c7 100644
--- a/engines/hypno/boyz/arcade.cpp
+++ b/engines/hypno/boyz/arcade.cpp
@@ -326,9 +326,6 @@ bool BoyzEngine::checkTransition(ArcadeTransitions &transitions, ArcadeShooting
 					_health = 0;
 					// Not sure how to handle this
 				}
-			} else if (_levelId == 352) {
-				// Objectives are never checked here, for some reason
-				_skipLevel = true;
 			} else if (_levelId == 354) {
 				if (ttime == 70) {
 					incInfoReceived();
diff --git a/engines/hypno/boyz/boyz.cpp b/engines/hypno/boyz/boyz.cpp
index 0055632accb..c2fb1d07e54 100644
--- a/engines/hypno/boyz/boyz.cpp
+++ b/engines/hypno/boyz/boyz.cpp
@@ -248,6 +248,12 @@ void BoyzEngine::loadAssets() {
 
 	loadArcadeLevel("c351.mi_", "<check_ho>", "<retry_menu>", "");
 	loadArcadeLevel("c352.mi_", "<check_ho>", "<retry_menu>", "");
+	ar = (ArcadeShooting *) _levels["c352.mi_"];
+	// These objectives, as every others, are unused
+	// We should remove them to avoid always failing the level
+	ar->objKillsRequired[0] = 0;
+	ar->objMissesAllowed[0] = 0;
+
 	loadArcadeLevel("c353.mi_", "<check_ho>", "<retry_menu>", "");
 	ar = (ArcadeShooting *) _levels["c353.mi_"];
 	ar->id = 353; // This corrects a mistake in the game scripts