diff options
| author | Strangerke | 2015-05-18 20:57:27 +0200 |
|---|---|---|
| committer | Strangerke | 2015-05-18 20:58:44 +0200 |
| commit | d82d476b277f80b69514fcb360ec47e9482e4a28 (patch) | |
| tree | bde3a597531652edfb0c0acc5b94593ca2772327 /engines/sherlock/sound.cpp | |
| parent | b1b7ee33dfa3cf675f7c02daf825c0b0d277227d (diff) | |
| download | scummvm-rg350-d82d476b277f80b69514fcb360ec47e9482e4a28.tar.gz scummvm-rg350-d82d476b277f80b69514fcb360ec47e9482e4a28.tar.bz2 scummvm-rg350-d82d476b277f80b69514fcb360ec47e9482e4a28.zip | |
SHERLOCK: Add code to make non-interactive demo completable
Diffstat (limited to 'engines/sherlock/sound.cpp')
| -rw-r--r-- | engines/sherlock/sound.cpp | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/engines/sherlock/sound.cpp b/engines/sherlock/sound.cpp index e0552a8b5e..5199fe7dc4 100644 --- a/engines/sherlock/sound.cpp +++ b/engines/sherlock/sound.cpp @@ -44,12 +44,16 @@ Sound::Sound(SherlockEngine *vm, Audio::Mixer *mixer): _vm(vm), _mixer(mixer) { _musicOn = true; _speechOn = true; - _vm->_res->addToCache("MUSIC.LIB"); - _vm->_res->addToCache("SND.SND"); - - if (!_vm->getIsDemo()) { + if (!_vm->_interactiveFl) _vm->_res->addToCache("TITLE.SND"); - _vm->_res->addToCache("EPILOGUE.SND"); + else { + _vm->_res->addToCache("MUSIC.LIB"); + _vm->_res->addToCache("SND.SND"); + + if (!_vm->getIsDemo()) { + _vm->_res->addToCache("TITLE.SND"); + _vm->_res->addToCache("EPILOGUE.SND"); + } } } @@ -64,6 +68,7 @@ void Sound::syncSoundSettings() { void Sound::loadSound(const Common::String &name, int priority) { // No implementation required in ScummVM + warning("loadSound"); } static int8 creativeADPCM_ScaleMap[64] = { |