diff options
| author | Filippos Karapetis | 2009-07-07 11:14:18 +0000 |
|---|---|---|
| committer | Filippos Karapetis | 2009-07-07 11:14:18 +0000 |
| commit | a9aaf56b3e81d46776a6fba574ab9833a8f21be1 (patch) | |
| tree | bbf78615a1e9418f98bd4cc48b86d6cd888b543d /engines/sci/engine/ksound.cpp | |
| parent | d55f7e72d0af649c472ccc8bb34a408ead3ae7f4 (diff) | |
| download | scummvm-rg350-a9aaf56b3e81d46776a6fba574ab9833a8f21be1.tar.gz scummvm-rg350-a9aaf56b3e81d46776a6fba574ab9833a8f21be1.tar.bz2 scummvm-rg350-a9aaf56b3e81d46776a6fba574ab9833a8f21be1.zip | |
Cleanup: added an enum for the auto-detected features, removed the selectors which are only used for auto-detection from the convenience selector map and placed feature auto-detection in a separate function. Also, now the automatically detected graphics resources are shown in the console.
svn-id: r42212
Diffstat (limited to 'engines/sci/engine/ksound.cpp')
| -rw-r--r-- | engines/sci/engine/ksound.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/engines/sci/engine/ksound.cpp b/engines/sci/engine/ksound.cpp index f1584bf975..ba70bf9f73 100644 --- a/engines/sci/engine/ksound.cpp +++ b/engines/sci/engine/ksound.cpp @@ -982,9 +982,9 @@ reg_t kDoSound_SCI1(EngineState *s, int funct_nr, int argc, reg_t *argv) { * Used for synthesized music playback */ reg_t kDoSound(EngineState *s, int funct_nr, int argc, reg_t *argv) { - if (s->_kernel->_selectorMap.setVol != -1) + if (s->_kernel->usesSci1SoundFunctions()) return kDoSound_SCI1(s, funct_nr, argc, argv); - else if (s->_kernel->_selectorMap.nodePtr != -1) + else if (s->_kernel->usesSci01SoundFunctions()) return kDoSound_SCI01(s, funct_nr, argc, argv); else return kDoSound_SCI0(s, funct_nr, argc, argv); |