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

[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:
fa6fcfc2ad HYPNO: restarting music when conversation is over in spider


Commit: fa6fcfc2ad9496b864b7727769fd9e5f529671ea
    https://github.com/scummvm/scummvm/commit/fa6fcfc2ad9496b864b7727769fd9e5f529671ea
Author: neuromancer (gustavo.grieco at gmail.com)
Date: 2022-02-13T18:17:59+01:00

Commit Message:
HYPNO: restarting music when conversation is over in spider

Changed paths:
    engines/hypno/scene.cpp
    engines/hypno/spider/talk.cpp


diff --git a/engines/hypno/scene.cpp b/engines/hypno/scene.cpp
index b0a5aa6c339..a7f116d852c 100644
--- a/engines/hypno/scene.cpp
+++ b/engines/hypno/scene.cpp
@@ -474,6 +474,11 @@ void HypnoEngine::runScene(Scene *scene) {
 			}
 		}
 
+		if (_music.empty() && !scene->music.empty() && _videosPlaying.empty() && _nextSequentialVideoToPlay.empty()) {
+			_music = scene->music;
+			playSound(_music, 0, scene->musicRate);
+		}
+
 		if (!_videosPlaying.empty() || !_videosLooping.empty() || !_nextSequentialVideoToPlay.empty()) {
 			drawScreen();
 			continue;
@@ -493,11 +498,6 @@ void HypnoEngine::runScene(Scene *scene) {
 			drawScreen();
 		}
 
-		if (_music.empty() && !scene->music.empty()) {
-			_music = scene->music;
-			playSound(_music, 0, scene->musicRate);
-		}
-
 		g_system->updateScreen();
 		g_system->delayMillis(30);
 	}
diff --git a/engines/hypno/spider/talk.cpp b/engines/hypno/spider/talk.cpp
index 61b7c79b116..0304ebd754c 100644
--- a/engines/hypno/spider/talk.cpp
+++ b/engines/hypno/spider/talk.cpp
@@ -106,6 +106,7 @@ void SpiderEngine::showConversation() {
 
 		debugC(1, kHypnoDebugScene, "Clearing conversation");
 		_conversation.clear();
+		_music.clear();
 
 		if (shouldEscape) {
 			runIntros(_escapeSequentialVideoToPlay);