diff options
| author | Filippos Karapetis | 2009-11-20 22:39:57 +0000 |
|---|---|---|
| committer | Filippos Karapetis | 2009-11-20 22:39:57 +0000 |
| commit | 10fbefcd60893f67bb10755d72430e7e60208d65 (patch) | |
| tree | 20ac58383ef3d1e0302339bdbd0151573171e16a /engines/sci | |
| parent | dac154e76cc175b5ef78cfa4088a724c141b177e (diff) | |
| download | scummvm-rg350-10fbefcd60893f67bb10755d72430e7e60208d65.tar.gz scummvm-rg350-10fbefcd60893f67bb10755d72430e7e60208d65.tar.bz2 scummvm-rg350-10fbefcd60893f67bb10755d72430e7e60208d65.zip | |
Simplified the doSound detection a bit
svn-id: r46028
Diffstat (limited to 'engines/sci')
| -rw-r--r-- | engines/sci/engine/state.cpp | 19 |
1 files changed, 11 insertions, 8 deletions
diff --git a/engines/sci/engine/state.cpp b/engines/sci/engine/state.cpp index 265e5d1a92..5480fc8489 100644 --- a/engines/sci/engine/state.cpp +++ b/engines/sci/engine/state.cpp @@ -501,15 +501,18 @@ SciVersion EngineState::detectDoSoundType() { // SCI0 sound code (i.e. SCI_VERSION_0_EARLY) _doSoundType = SCI_VERSION_0_EARLY; } else { - if (!autoDetectFeature(kDetectSoundType)) { - warning("DoSound detection failed, taking an educated guess"); + if (getSciVersion() >= SCI_VERSION_1_LATE) { + // All SCI1 late games use the newer doSound semantics + _doSoundType = SCI_VERSION_1_LATE; + } else { + if (!autoDetectFeature(kDetectSoundType)) { + warning("DoSound detection failed, taking an educated guess"); - if (getSciVersion() >= SCI_VERSION_1_MIDDLE) - _doSoundType = SCI_VERSION_1_LATE; - else if (getSciVersion() > SCI_VERSION_01) - _doSoundType = SCI_VERSION_1_EARLY; - else - _doSoundType = SCI_VERSION_0_EARLY; + if (getSciVersion() >= SCI_VERSION_1_MIDDLE) + _doSoundType = SCI_VERSION_1_LATE; + else if (getSciVersion() > SCI_VERSION_01) + _doSoundType = SCI_VERSION_1_EARLY; + } } } |