diff options
| author | Martin Kiewitz | 2015-06-04 20:51:27 +0200 |
|---|---|---|
| committer | Martin Kiewitz | 2015-06-04 20:51:27 +0200 |
| commit | 16d124b2317a61404ba4371bc7609a2770c03f3d (patch) | |
| tree | ce1fa396934a6495b4151ff1ac971c0b83fab8de /engines/sherlock/music.cpp | |
| parent | 37cc8df5a593ed6d76a5fa5f1221fc9a1b5df81e (diff) | |
| download | scummvm-rg350-16d124b2317a61404ba4371bc7609a2770c03f3d.tar.gz scummvm-rg350-16d124b2317a61404ba4371bc7609a2770c03f3d.tar.bz2 scummvm-rg350-16d124b2317a61404ba4371bc7609a2770c03f3d.zip | |
SHERLOCK: tiny bit of work on 3DO
Diffstat (limited to 'engines/sherlock/music.cpp')
| -rw-r--r-- | engines/sherlock/music.cpp | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/engines/sherlock/music.cpp b/engines/sherlock/music.cpp index b83e8e7de9..c0a63bea8d 100644 --- a/engines/sherlock/music.cpp +++ b/engines/sherlock/music.cpp @@ -193,6 +193,15 @@ Music::Music(SherlockEngine *vm, Audio::Mixer *mixer) : _vm(vm), _mixer(mixer) { _musicPlaying = false; _musicOn = true; + if (_vm->getPlatform() == Common::kPlatform3DO) { + // 3DO - disable music + // TODO: Implement music support + _driver = NULL; + _musicType = MT_NULL; + _musicOn = false; + return; + } + if (_vm->_interactiveFl) _vm->_res->addToCache("MUSIC.LIB"); @@ -311,6 +320,8 @@ void Music::syncMusicSettings() { } bool Music::playMusic(const Common::String &name) { + if (!_driver) + return false; if (!_musicOn) return false; |