From bc43ff820e309ce1f6d7b5748bf8d43647433c67 Mon Sep 17 00:00:00 2001
From: Joseph-Eugene Winzer
Date: Mon, 28 Aug 2017 07:21:00 +0200
Subject:  SUPERNOVA: Ignores mouse clicks while sound is playing

---
 engines/supernova/supernova.cpp | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/engines/supernova/supernova.cpp b/engines/supernova/supernova.cpp
index aa396081b8..941bfc8c40 100644
--- a/engines/supernova/supernova.cpp
+++ b/engines/supernova/supernova.cpp
@@ -186,6 +186,9 @@ void SupernovaEngine::updateEvents() {
 			// fallthrough
 		case Common::EVENT_RBUTTONUP:
 			// fallthrough
+			if (_mixer->isSoundHandleActive(_soundHandle) &&
+			    (_gm->_currentRoom != _gm->_rooms[INTRO]))
+				return;
 			_gm->_mouseClicked = true;
 		case Common::EVENT_MOUSEMOVE:
 			_gm->_mouseClickType = _event.type;
@@ -269,8 +272,6 @@ void SupernovaEngine::playSound(AudioIndex sample) {
 	            11931, Audio::FLAG_UNSIGNED | Audio::FLAG_LITTLE_ENDIAN, DisposeAfterUse::NO);
 	stopSound();
 	_mixer->playStream(Audio::Mixer::kPlainSoundType, &_soundHandle, audioStream);
-
-	// TODO: Stall till sound was played
 }
 
 void SupernovaEngine::stopSound() {
-- 
cgit v1.2.3