diff options
| author | Colin Snover | 2017-06-16 16:32:16 -0500 |
|---|---|---|
| committer | Colin Snover | 2017-06-18 21:42:58 -0500 |
| commit | d556dcc57bf50a03d81ab7a1ef59a9e5758465bf (patch) | |
| tree | 977a4935fdff18a022860871475a40af25c01e95 /engines/sci/engine/features.cpp | |
| parent | 733eaeb499bb39f75e7dd218df4c71b06b7e1610 (diff) | |
| download | scummvm-rg350-d556dcc57bf50a03d81ab7a1ef59a9e5758465bf.tar.gz scummvm-rg350-d556dcc57bf50a03d81ab7a1ef59a9e5758465bf.tar.bz2 scummvm-rg350-d556dcc57bf50a03d81ab7a1ef59a9e5758465bf.zip | |
SCI: Switch SCI2 games to use Audio32
Upon investigation of Sound code across SCI32 games, it was
determined that there are actually (at least) 3 different
revisions, not just a single SCI2.1 version. This patch only
changes the parts of Sound code that are relevant to the correct
use of Audio32.
Fixes Trac#9736, Trac#9756, Trac#9767, Trac#9791.
Diffstat (limited to 'engines/sci/engine/features.cpp')
| -rw-r--r-- | engines/sci/engine/features.cpp | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/engines/sci/engine/features.cpp b/engines/sci/engine/features.cpp index 9251ac69e1..76f3c358d4 100644 --- a/engines/sci/engine/features.cpp +++ b/engines/sci/engine/features.cpp @@ -143,8 +143,17 @@ SciVersion GameFeatures::detectDoSoundType() { // SCI0LATE. Although the last SCI0EARLY game (lsl2) uses SCI0LATE resources _doSoundType = g_sci->getResMan()->detectEarlySound() ? SCI_VERSION_0_EARLY : SCI_VERSION_0_LATE; #ifdef ENABLE_SCI32 + } else if (getSciVersion() >= SCI_VERSION_2_1_MIDDLE && + g_sci->getGameId() != GID_SQ6 && + // Assuming MGDX uses SCI2.1early sound mode since SQ6 does + // and it was released earlier, but not verified (Phar Lap + // Windows-only release) + g_sci->getGameId() != GID_MOTHERGOOSEHIRES) { + _doSoundType = SCI_VERSION_2_1_MIDDLE; } else if (getSciVersion() >= SCI_VERSION_2_1_EARLY) { _doSoundType = SCI_VERSION_2_1_EARLY; + } else if (getSciVersion() >= SCI_VERSION_2) { + _doSoundType = SCI_VERSION_2; #endif } else if (SELECTOR(nodePtr) == -1) { // No nodePtr selector, so this game is definitely using newer |