[Scummvm-git-logs] scummvm master -> 271f2ae159c0307dddc7c7031ff119eb5d48e075

[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:
8cb54c005b HYPNO: show correct video during death sequence in boyz
271f2ae159 HYPNO: show correct video during death sequences in boyz


Commit: 8cb54c005b70580b257f524c22f4515434eb7a65
    https://github.com/scummvm/scummvm/commit/8cb54c005b70580b257f524c22f4515434eb7a65
Author: neuromancer (gustavo.grieco at gmail.com)
Date: 2022-06-14T08:47:26+02:00

Commit Message:
HYPNO: show correct video during death sequence 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 ac4cbe9b74d..2a613f81a7c 100644
--- a/engines/hypno/boyz/arcade.cpp
+++ b/engines/hypno/boyz/arcade.cpp
@@ -95,9 +95,14 @@ void BoyzEngine::runAfterArcade(ArcadeShooting *arc) {
 		if (_arcadeMode == "YS")
 			return;
 		_stats = _lastStats;
-		MVideo video(_deathDay[_currentActor], Common::Point(0, 0), false, true, false);
 		disableCursor();
-		runIntro(video);
+		if (getTerritory(_currentLevel) <= 4) {
+			MVideo video(_deathDay[_currentActor], Common::Point(0, 0), false, true, false);
+			runIntro(video);
+		} else {
+			MVideo video(_deathNight[_currentActor], Common::Point(0, 0), false, true, false);
+			runIntro(video);
+		}
 		return;
 	}
 
diff --git a/engines/hypno/boyz/boyz.cpp b/engines/hypno/boyz/boyz.cpp
index f704d6efb61..ceffbf07291 100644
--- a/engines/hypno/boyz/boyz.cpp
+++ b/engines/hypno/boyz/boyz.cpp
@@ -694,10 +694,10 @@ void BoyzEngine::loadAssets() {
 	_deathDay[6] = "preload/deathd6s.smk";
 
 	_deathNight[0] = "";
-	_deathNight[1] = "preload/deathn2s.smk";
-	_deathNight[2] = "preload/deathn3s.smk";
-	_deathNight[3] = "preload/deathn4s.smk";
-	_deathNight[4] = "";
+	_deathNight[1] = "";
+	_deathNight[2] = "preload/deathn2s.smk";
+	_deathNight[3] = "preload/deathn3s.smk";
+	_deathNight[4] = "preload/deathn4s.smk";
 	_deathNight[5] = "";
 	_deathNight[6] = "";
 


Commit: 271f2ae159c0307dddc7c7031ff119eb5d48e075
    https://github.com/scummvm/scummvm/commit/271f2ae159c0307dddc7c7031ff119eb5d48e075
Author: neuromancer (gustavo.grieco at gmail.com)
Date: 2022-06-14T08:47:26+02:00

Commit Message:
HYPNO: show correct video during death sequences in boyz

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


diff --git a/engines/hypno/boyz/arcade.cpp b/engines/hypno/boyz/arcade.cpp
index 2a613f81a7c..588e76e87a6 100644
--- a/engines/hypno/boyz/arcade.cpp
+++ b/engines/hypno/boyz/arcade.cpp
@@ -96,12 +96,18 @@ void BoyzEngine::runAfterArcade(ArcadeShooting *arc) {
 			return;
 		_stats = _lastStats;
 		disableCursor();
-		if (getTerritory(_currentLevel) <= 4) {
-			MVideo video(_deathDay[_currentActor], Common::Point(0, 0), false, true, false);
+
+		if (_levelId == 36 && !checkArcadeObjectives()) {
+			MVideo video("warnings/w09s.smk", Common::Point(0, 0), false, true, false);
 			runIntro(video);
 		} else {
-			MVideo video(_deathNight[_currentActor], Common::Point(0, 0), false, true, false);
-			runIntro(video);
+			if (getTerritory(_currentLevel) <= 4) {
+				MVideo video(_deathDay[_currentActor], Common::Point(0, 0), false, true, false);
+				runIntro(video);
+			} else {
+				MVideo video(_deathNight[_currentActor], Common::Point(0, 0), false, true, false);
+				runIntro(video);
+			}
 		}
 		return;
 	}