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

[neuromancer]

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

Summary:
c405828d10 HYPNO: improved transition implementation for wet and boyz


Commit: c405828d10c506abc525cdfebc0230babe18d64f
    https://github.com/scummvm/scummvm/commit/c405828d10c506abc525cdfebc0230babe18d64f
Author: neuromancer (gustavo.grieco at gmail.com)
Date: 2022-05-12T21:37:14+02:00

Commit Message:
HYPNO: improved transition implementation for wet and boyz

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


diff --git a/engines/hypno/boyz/arcade.cpp b/engines/hypno/boyz/arcade.cpp
index 1d42f721682..38c1163effd 100644
--- a/engines/hypno/boyz/arcade.cpp
+++ b/engines/hypno/boyz/arcade.cpp
@@ -180,7 +180,15 @@ bool BoyzEngine::checkTransition(ArcadeTransitions &transitions, ArcadeShooting
 	int ttime = at.time;
 	if (_background->decoder->getCurFrame() > ttime) {
 		if (at.video == "NONE") {
-			if (!arc->additionalSound.empty())
+			if (!at.palette.empty()) {
+				_background->decoder->pauseVideo(true);
+				_currentPalette = at.palette;
+				loadPalette(_currentPalette);
+				_background->decoder->pauseVideo(false);
+				drawPlayer();
+				updateScreen(*_background);
+				drawScreen();
+			} else if (!arc->additionalSound.empty())
 				playSound(arc->additionalSound, 1, arc->additionalSoundRate);
 		} else if (!at.video.empty()) {
 			_background->decoder->pauseVideo(true);
diff --git a/engines/hypno/wet/arcade.cpp b/engines/hypno/wet/arcade.cpp
index 1efa36c46d0..f99b7f1ee08 100644
--- a/engines/hypno/wet/arcade.cpp
+++ b/engines/hypno/wet/arcade.cpp
@@ -295,6 +295,11 @@ bool WetEngine::checkTransition(ArcadeTransitions &transitions, ArcadeShooting *
 		transitions.pop_front();
 	} else if (_background->decoder->getCurFrame() > ttime) {
 
+		if (at.video == "NONE") {
+			//TODO
+			return true;
+		}
+
 		if (_playerFrameSeps.size() == 1) {
 			_playerFrameStart = _playerFrameEnd + 1;
 			_playerFrameSep = *_playerFrameSeps.begin();
@@ -351,14 +356,12 @@ bool WetEngine::checkTransition(ArcadeTransitions &transitions, ArcadeShooting *
 			updateScreen(*_background);
 			drawScreen();
 			drawCursorArcade(g_system->getEventManager()->getMousePos());
-		} else if (!at.sound.empty()) {
-			playSound(at.sound, 1);
+			if (!_music.empty())
+				playSound(_music, 0, arc->musicRate); // restore music
 		} else
 			error ("Invalid transition at %d", ttime);
 
 		transitions.pop_front();
-		if (!_music.empty())
-			playSound(_music, 0, arc->musicRate); // restore music
 		return true;
 	}
 	return false;