aboutsummaryrefslogtreecommitdiff
path: root/engines/sci/sound
diff options
context:
space:
mode:
authorFilippos Karapetis2010-07-01 17:42:39 +0000
committerFilippos Karapetis2010-07-01 17:42:39 +0000
commita1dc56429c3d61afe960924abdc4ee241c4c9fe6 (patch)
tree810ca90a610e096120049e3148472d350a15f449 /engines/sci/sound
parent6859a305553ad3d5e88da1bcdd63aee7c8c44824 (diff)
downloadscummvm-rg350-a1dc56429c3d61afe960924abdc4ee241c4c9fe6.tar.gz
scummvm-rg350-a1dc56429c3d61afe960924abdc4ee241c4c9fe6.tar.bz2
scummvm-rg350-a1dc56429c3d61afe960924abdc4ee241c4c9fe6.zip
SCI: Removed duplicate warning for missing audio samples
svn-id: r50560
Diffstat (limited to 'engines/sci/sound')
-rw-r--r--engines/sci/sound/audio.cpp7
1 files changed, 4 insertions, 3 deletions
diff --git a/engines/sci/sound/audio.cpp b/engines/sci/sound/audio.cpp
index ed9061ab81..2e92754cad 100644
--- a/engines/sci/sound/audio.cpp
+++ b/engines/sci/sound/audio.cpp
@@ -70,10 +70,11 @@ int AudioPlayer::startAudio(uint16 module, uint32 number) {
_mixer->playStream(Audio::Mixer::kSpeechSoundType, &_audioHandle, audioStream);
return sampleLen;
} else {
- warning("startAudio: unable to create stream for audio number %d, module %d", number, module);
+ // Don't throw a warning in this case. getAudioStream() already has. Some games
+ // do miss audio entries (perhaps because of a typo, or because they were simply
+ // forgotten).
+ return 0;
}
-
- return 0;
}
int AudioPlayer::wPlayAudio(uint16 module, uint32 tuple) {