aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoseph-Eugene Winzer2017-08-28 07:21:00 +0200
committerThierry Crozat2018-01-23 01:52:59 +0000
commitbc43ff820e309ce1f6d7b5748bf8d43647433c67 (patch)
treea232ed901f230c2d734b74eed2e2da47971ccf61
parent18abc4702afb9617a8f392620d4846668faa679b (diff)
downloadscummvm-rg350-bc43ff820e309ce1f6d7b5748bf8d43647433c67.tar.gz
scummvm-rg350-bc43ff820e309ce1f6d7b5748bf8d43647433c67.tar.bz2
scummvm-rg350-bc43ff820e309ce1f6d7b5748bf8d43647433c67.zip
SUPERNOVA: Ignores mouse clicks while sound is playing
-rw-r--r--engines/supernova/supernova.cpp5
1 files 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() {