[Scummvm-git-logs] scummvm master -> 806e8263fb991f68277c7dc171c02656a70f53a0

[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:
242a48a1f5 HYPNO: avoid drawing too many profiles in the boyz main menu
806e8263fb HYPNO: disable user interaction during cutscenes/intro commands


Commit: 242a48a1f5d25a55dff175420b4083603cd27aa3
    https://github.com/scummvm/scummvm/commit/242a48a1f5d25a55dff175420b4083603cd27aa3
Author: neuromancer (gustavo.grieco at gmail.com)
Date: 2022-08-11T08:52:14+02:00

Commit Message:
HYPNO: avoid drawing too many profiles in the boyz main menu

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


diff --git a/engines/hypno/boyz/hard.cpp b/engines/hypno/boyz/hard.cpp
index ce6473bfd9b..b525e867b9b 100644
--- a/engines/hypno/boyz/hard.cpp
+++ b/engines/hypno/boyz/hard.cpp
@@ -70,6 +70,8 @@ void BoyzEngine::runMainMenu(Code *code) {
 	for (Common::StringArray::iterator it = profiles.begin(); it != profiles.end(); ++it) {
 		drawString("block05.fgx", *it, 130, posY, 170, c);
 		posY = posY + 10;
+		if (posY >= 185)
+			break;
 	}
 	while (!shouldQuit() && cont) {
 		while (g_system->getEventManager()->pollEvent(event)) {


Commit: 806e8263fb991f68277c7dc171c02656a70f53a0
    https://github.com/scummvm/scummvm/commit/806e8263fb991f68277c7dc171c02656a70f53a0
Author: neuromancer (gustavo.grieco at gmail.com)
Date: 2022-08-11T08:52:14+02:00

Commit Message:
HYPNO: disable user interaction during cutscenes/intro commands

Changed paths:
    engines/hypno/actions.cpp


diff --git a/engines/hypno/actions.cpp b/engines/hypno/actions.cpp
index 1f0555dadff..ea85243317f 100644
--- a/engines/hypno/actions.cpp
+++ b/engines/hypno/actions.cpp
@@ -54,9 +54,6 @@ void HypnoEngine::runMenu(Hotspots *hs, bool only_menu) {
 		case IntroAction:
 			runIntro((Intro *)action);
 			break;
-		case CutsceneAction:
-			runCutscene((Cutscene *)action);
-			break;
 		case PaletteAction:
 			runPalette((Palette *)action);
 			break;
@@ -131,14 +128,21 @@ void HypnoEngine::runIntro(Intro *a) {
 
 	_intros[a->path] = true;
 	MVideo v(a->path, Common::Point(0, 0), false, true, false);
+	disableCursor();
 	runIntro(v);
+	defaultCursor();
 }
 
 void HypnoEngine::runCutscene(Cutscene *a) {
 	stopSound();
 	defaultCursor();
 	_music.clear();
-	_nextSequentialVideoToPlay.push_back(MVideo(a->path, Common::Point(0, 0), false, true, false));
+	MVideo v(a->path, Common::Point(0, 0), false, true, false);
+	disableCursor();
+	runIntro(v);
+	defaultCursor();
+	runMenu(stack.back());
+	drawScreen();
 }
 
 bool HypnoEngine::runGlobal(Global *a) {