aboutsummaryrefslogtreecommitdiff
path: root/sword2
diff options
context:
space:
mode:
authorTorbjörn Andersson2005-02-18 16:50:51 +0000
committerTorbjörn Andersson2005-02-18 16:50:51 +0000
commit5aa2ea2d44711805b3a04028d8c767ef6b58a80e (patch)
treee7a2b519467d8f11bf5ca0daba435692567e4e87 /sword2
parent663308f61f4976b0fa235ef6986d0104cea7ddbf (diff)
downloadscummvm-rg350-5aa2ea2d44711805b3a04028d8c767ef6b58a80e.tar.gz
scummvm-rg350-5aa2ea2d44711805b3a04028d8c767ef6b58a80e.tar.bz2
scummvm-rg350-5aa2ea2d44711805b3a04028d8c767ef6b58a80e.zip
Forgot to check if preFetchCompSpeech() could find the speech file. Now it
will work even if the file is missing. (This only affects the cutscene player.) svn-id: r16806
Diffstat (limited to 'sword2')
-rw-r--r--sword2/driver/d_sound.cpp3
1 files changed, 3 insertions, 0 deletions
diff --git a/sword2/driver/d_sound.cpp b/sword2/driver/d_sound.cpp
index 7279db7538..39992b18d6 100644
--- a/sword2/driver/d_sound.cpp
+++ b/sword2/driver/d_sound.cpp
@@ -691,6 +691,9 @@ uint32 Sound::preFetchCompSpeech(uint32 speechId, uint16 **buf) {
AudioStream *input = getAudioStream(&fp, "speech", _vm->_resman->whichCd(), speechId, &numSamples);
+ if (!input)
+ return 0;
+
*buf = NULL;
// Decompress data into speech buffer.