aboutsummaryrefslogtreecommitdiff
path: root/scumm
diff options
context:
space:
mode:
authorMax Horn2004-02-03 08:53:13 +0000
committerMax Horn2004-02-03 08:53:13 +0000
commitf36710f8b4e5d28517fdcb35ac4fefbd15734be7 (patch)
tree357832b8aec085f1a188a4950d794c2202fac0ae /scumm
parent43efc8bed0d908357c2bb0d0c626cdaba9cb35a8 (diff)
downloadscummvm-rg350-f36710f8b4e5d28517fdcb35ac4fefbd15734be7.tar.gz
scummvm-rg350-f36710f8b4e5d28517fdcb35ac4fefbd15734be7.tar.bz2
scummvm-rg350-f36710f8b4e5d28517fdcb35ac4fefbd15734be7.zip
Act more gracefully when failing to load a (VOC) sound (should help bug #889442)
svn-id: r12719
Diffstat (limited to 'scumm')
-rw-r--r--scumm/sound.cpp5
1 files changed, 5 insertions, 0 deletions
diff --git a/scumm/sound.cpp b/scumm/sound.cpp
index b66c70a406..05a5210c3d 100644
--- a/scumm/sound.cpp
+++ b/scumm/sound.cpp
@@ -830,6 +830,11 @@ void Sound::startSfxSound(File *file, int file_size, PlayingSoundHandle *handle,
} else {
input = makeVOCStream(_sfxFile);
}
+
+ if (!input) {
+ warning("startSfxSound failed to load sound");
+ return 0;
+ }
if (_vm->_imuseDigital) {
//_vm->_imuseDigital->stopSound(kTalkSoundID);