[Scummvm-git-logs] scummvm master -> 147e9703c0d653204138dedb160a5e7844e69597

[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:
0af0943868 HYPNO: implemented helicopter boss fight in boyz
147e9703c0 HYPNO: added end credits in boyz


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

Commit Message:
HYPNO: implemented helicopter boss fight in boyz

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


diff --git a/engines/hypno/arcade.cpp b/engines/hypno/arcade.cpp
index 986ffcd9cf6..54dbb43b5a2 100644
--- a/engines/hypno/arcade.cpp
+++ b/engines/hypno/arcade.cpp
@@ -224,6 +224,7 @@ void HypnoEngine::runArcade(ArcadeShooting *arc) {
 	_skipLevel = false;
 	_loseLevel = false;
 	_skipDefeatVideo = false;
+	_skipNextVideo = false;
 	_mask = nullptr;
 	_masks = nullptr;
 
@@ -420,7 +421,7 @@ void HypnoEngine::runArcade(ArcadeShooting *arc) {
 				break;
 			}
 
-			if (!arc->nextLevelVideo.empty()) {
+			if (!arc->nextLevelVideo.empty() && !_skipNextVideo) {
 				MVideo video(arc->nextLevelVideo, Common::Point(0, 0), false, true, false);
 				disableCursor();
 				runIntro(video);
diff --git a/engines/hypno/boyz/arcade.cpp b/engines/hypno/boyz/arcade.cpp
index 44128ed729d..ed35465a3a0 100644
--- a/engines/hypno/boyz/arcade.cpp
+++ b/engines/hypno/boyz/arcade.cpp
@@ -460,6 +460,17 @@ bool BoyzEngine::shoot(const Common::Point &mousePos, ArcadeShooting *arc, bool
 		_shoots[i].destroyed = true;
 		_objKillsCount[_objIdx] = _objKillsCount[_objIdx] + _shoots[i].objKillsCount;
 		_shootsDestroyed[_shoots[i].name] = true;
+
+		if (_shoots[i].name == "HELICOPTER") {
+			_background->decoder->pauseVideo(true);
+			MVideo video(arc->hitBoss2Video, Common::Point(0, 0), false, true, false);
+			disableCursor();
+			runIntro(video);
+			_skipLevel = true;
+			_skipNextVideo = true;
+			return false;
+		}
+
 		_background->decoder->forceSeekToFrame(_shoots[i].explosionFrames[0].start - 3);
 		_masks->decoder->forceSeekToFrame(_shoots[i].explosionFrames[0].start - 3);
 		changeCursor(_crosshairsActive[_currentWeapon], _crosshairsPalette, true);
diff --git a/engines/hypno/hypno.cpp b/engines/hypno/hypno.cpp
index 2fcfc7f2264..2c6052196b0 100644
--- a/engines/hypno/hypno.cpp
+++ b/engines/hypno/hypno.cpp
@@ -54,7 +54,7 @@ HypnoEngine::HypnoEngine(OSystem *syst, const ADGameDescription *gd)
 	  _playerFrameIdx(0), _playerFrameSep(0), _refreshConversation(false),
 	  _countdown(0), _timerStarted(false), _score(0), _lives(0),
 	  _defaultCursor(""), _defaultCursorIdx(0),  _skipDefeatVideo(false),
-	  _background(nullptr), _masks(nullptr), _musicRate(0),
+	  _background(nullptr), _masks(nullptr), _musicRate(0), _skipNextVideo(false),
 	  _additionalVideo(nullptr), _ammo(0), _maxAmmo(0),
 	  _doNotStopSounds(false), _screenW(0), _screenH(0) { // Every games initializes its own resolution
 	_rnd = new Common::RandomSource("hypno");
diff --git a/engines/hypno/hypno.h b/engines/hypno/hypno.h
index e63d034bfef..6df6339d994 100644
--- a/engines/hypno/hypno.h
+++ b/engines/hypno/hypno.h
@@ -304,6 +304,7 @@ public:
 	bool _skipLevel;
 	bool _loseLevel;
 	bool _skipDefeatVideo;
+	bool _skipNextVideo;
 
 	virtual void drawCursorArcade(const Common::Point &mousePos);
 	virtual void drawPlayer();


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

Commit Message:
HYPNO: added end credits in boyz

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


diff --git a/engines/hypno/boyz/boyz.cpp b/engines/hypno/boyz/boyz.cpp
index 636c05756b5..41a90fc2f42 100644
--- a/engines/hypno/boyz/boyz.cpp
+++ b/engines/hypno/boyz/boyz.cpp
@@ -234,6 +234,9 @@ void BoyzEngine::loadAssets() {
 	loadArcadeLevel("c58.mi_", "c59.mi_", "<retry_menu>", "");
 	loadArcadeLevel("c59.mi_", "<credits>", "<retry_menu>", "");
 
+	Code *credits = new Code("<credits>");
+	_levels["<credits>"] = credits;
+
 	Global *gl;
 	ChangeLevel *cl;
 	Cutscene *cs;
diff --git a/engines/hypno/boyz/hard.cpp b/engines/hypno/boyz/hard.cpp
index edeccfba7b5..a876ae30dbd 100644
--- a/engines/hypno/boyz/hard.cpp
+++ b/engines/hypno/boyz/hard.cpp
@@ -40,6 +40,8 @@ void BoyzEngine::runCode(Code *code) {
 		runCheckC3(code);
 	else if (code->name == "<check_ho>")
 		runCheckHo(code);
+	else if (code->name == "<credits>")
+		endCredits(code);
 	else
 		error("invalid hardcoded level: %s", code->name.c_str());
 }