aboutsummaryrefslogtreecommitdiff
path: root/engines
diff options
context:
space:
mode:
authorFilippos Karapetis2009-12-26 13:50:52 +0000
committerFilippos Karapetis2009-12-26 13:50:52 +0000
commit0de0abb5d34575ebcb3cbf3d58357f17fc00ff96 (patch)
tree8c2c7ee94e007f68626db5567da1b0bf8569a8ae /engines
parent925c1744ec7af876ef64d94b5f9250e80630317c (diff)
downloadscummvm-rg350-0de0abb5d34575ebcb3cbf3d58357f17fc00ff96.tar.gz
scummvm-rg350-0de0abb5d34575ebcb3cbf3d58357f17fc00ff96.tar.bz2
scummvm-rg350-0de0abb5d34575ebcb3cbf3d58357f17fc00ff96.zip
Case kSciAudioLanguage in kDoAudio always checks for audio capability in SCI1.1 games, regardless of parameters. Fixes a warning in SQ4CD
svn-id: r46584
Diffstat (limited to 'engines')
-rw-r--r--engines/sci/engine/ksound.cpp7
1 files changed, 3 insertions, 4 deletions
diff --git a/engines/sci/engine/ksound.cpp b/engines/sci/engine/ksound.cpp
index cde332b048..6ed2626279 100644
--- a/engines/sci/engine/ksound.cpp
+++ b/engines/sci/engine/ksound.cpp
@@ -135,12 +135,11 @@ reg_t kDoAudio(EngineState *s, int argc, reg_t *argv) {
mixer->setVolumeForSoundType(Audio::Mixer::kSpeechSoundType, argv[1].toUint16());
break;
case kSciAudioLanguage:
- if (argc == 1) {
- // In SCI1.1: tests for digital audio support
+ // In SCI1.1: tests for digital audio support
+ if (getSciVersion() == SCI_VERSION_1_1)
return make_reg(0, 1);
- } else {
+ else
s->resMan->setAudioLanguage(argv[1].toSint16());
- }
break;
case kSciAudioCD:
return kDoCdAudio(s, argc - 1, argv + 1);