aboutsummaryrefslogtreecommitdiff
path: root/queen
diff options
context:
space:
mode:
authorJoost Peters2004-10-01 14:48:49 +0000
committerJoost Peters2004-10-01 14:48:49 +0000
commit6751e16da1d1283c477032c7b29ecfb9bdd8ee66 (patch)
treec45b75cc4a6c60a9d6c8cb5177fc4d0aa3eedba3 /queen
parent9570bf38de35f680b551b9390e1690b0b8d704ea (diff)
downloadscummvm-rg350-6751e16da1d1283c477032c7b29ecfb9bdd8ee66.tar.gz
scummvm-rg350-6751e16da1d1283c477032c7b29ecfb9bdd8ee66.tar.bz2
scummvm-rg350-6751e16da1d1283c477032c7b29ecfb9bdd8ee66.zip
Use the SilentSound class for sfx/speech when sound output is not possible.
This should fix the hangs where the game waits for sfx/speech to finish in these cases. svn-id: r15370
Diffstat (limited to 'queen')
-rw-r--r--queen/sound.cpp3
1 files changed, 3 insertions, 0 deletions
diff --git a/queen/sound.cpp b/queen/sound.cpp
index 47a1d26315..04dfec2811 100644
--- a/queen/sound.cpp
+++ b/queen/sound.cpp
@@ -40,6 +40,9 @@ Sound::~Sound() {
}
Sound *Sound::giveSound(SoundMixer *mixer, QueenEngine *vm, uint8 compression) {
+ if (!mixer->isReady())
+ return new SilentSound(mixer, vm);
+
switch(compression) {
case COMPRESSION_NONE:
return new SBSound(mixer, vm);