aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTorbjörn Andersson2003-12-29 13:41:20 +0000
committerTorbjörn Andersson2003-12-29 13:41:20 +0000
commit6fe24ad40a93fe508d4e42954e24963a78976128 (patch)
treeb29178886c608f11d108407ca8848ec5c2ca06c0
parent14cfaf88520e45205689d35ce14aaa40d2a4368a (diff)
downloadscummvm-rg350-6fe24ad40a93fe508d4e42954e24963a78976128.tar.gz
scummvm-rg350-6fe24ad40a93fe508d4e42954e24963a78976128.tar.bz2
scummvm-rg350-6fe24ad40a93fe508d4e42954e24963a78976128.zip
Emergency bugfix to keep Full Throttle from crashing as soon as someone
tries to speak. I don't know this code well enough to know if there is a more appropriate way of fixing this... svn-id: r12007
-rw-r--r--scumm/imuse_digi.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/scumm/imuse_digi.cpp b/scumm/imuse_digi.cpp
index 8549c32638..d73c7bc688 100644
--- a/scumm/imuse_digi.cpp
+++ b/scumm/imuse_digi.cpp
@@ -791,7 +791,7 @@ void IMuseDigital::startSound(int sound, byte *voc_src, int voc_size, int voc_ra
byte *data;
if ((sound == kTalkSoundID) && (_voiceVocData) || (READ_UINT32(ptr) == MKID('Crea'))) {
- if (READ_UINT32(ptr) == MKID('Crea')) {
+ if (ptr && READ_UINT32(ptr) == MKID('Crea')) {
int loops = 0;
voc_src = readVOCFromMemory(ptr, voc_size, voc_rate, loops);
}