aboutsummaryrefslogtreecommitdiff
path: root/engines/sci
diff options
context:
space:
mode:
authorMartin Kiewitz2010-01-01 14:41:11 +0000
committerMartin Kiewitz2010-01-01 14:41:11 +0000
commit7bb18a018aba0c2bd49abe9c44eb9b13c5b8e1b7 (patch)
treed394678ffdeecf25a36efb9d1e748a0ee20f577a /engines/sci
parent199765b415a531d7e163727e9aa6d97288931892 (diff)
downloadscummvm-rg350-7bb18a018aba0c2bd49abe9c44eb9b13c5b8e1b7.tar.gz
scummvm-rg350-7bb18a018aba0c2bd49abe9c44eb9b13c5b8e1b7.tar.bz2
scummvm-rg350-7bb18a018aba0c2bd49abe9c44eb9b13c5b8e1b7.zip
SCI/newmusic: doing version check before looking for audio resource
svn-id: r46831
Diffstat (limited to 'engines/sci')
-rw-r--r--engines/sci/sfx/soundcmd.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/engines/sci/sfx/soundcmd.cpp b/engines/sci/sfx/soundcmd.cpp
index 4316192dbd..adb90e3806 100644
--- a/engines/sci/sfx/soundcmd.cpp
+++ b/engines/sci/sfx/soundcmd.cpp
@@ -292,7 +292,7 @@ void SoundCommandParser::cmdInitHandle(reg_t obj, int16 value) {
// effects. If the resource exists, play it using map 65535 (sound
// effects map)
- if (_resMan->testResource(ResourceId(kResourceTypeAudio, number)) && getSciVersion() >= SCI_VERSION_1_1) {
+ if (getSciVersion() >= SCI_VERSION_1_1 && _resMan->testResource(ResourceId(kResourceTypeAudio, number))) {
// Found a relevant audio resource, play it
int sampleLen;
newSound->pStreamAud = _audio->getAudioStream(number, 65535, &sampleLen);