diff options
| author | Matthew Stewart | 2018-05-08 22:48:40 -0400 |
|---|---|---|
| committer | Eugene Sandulenko | 2018-08-09 08:37:30 +0200 |
| commit | d37e2aba0e932c3d9c082823caf526fcb415fd50 (patch) | |
| tree | c29ea741cf473c8da2f7c41c01185b3df14b7a68 /engines/startrek/sound.cpp | |
| parent | e206d8e19875f2545b59e68c753d45b864228f21 (diff) | |
| download | scummvm-rg350-d37e2aba0e932c3d9c082823caf526fcb415fd50.tar.gz scummvm-rg350-d37e2aba0e932c3d9c082823caf526fcb415fd50.tar.bz2 scummvm-rg350-d37e2aba0e932c3d9c082823caf526fcb415fd50.zip | |
STARTREK: Options menu
Diffstat (limited to 'engines/startrek/sound.cpp')
| -rw-r--r-- | engines/startrek/sound.cpp | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/engines/startrek/sound.cpp b/engines/startrek/sound.cpp index c5e63239ae..ac23cf620e 100644 --- a/engines/startrek/sound.cpp +++ b/engines/startrek/sound.cpp @@ -79,12 +79,8 @@ Sound::~Sound() { void Sound::playMidiTrack(int track) { - if (!_vm->_musicEnabled) + if (!_vm->_musicEnabled || !_vm->_musicWorking) return; - /* - if (!_vm->_word_467a8) - return; - */ assert(loadedSoundData != NULL); @@ -137,7 +133,7 @@ void Sound::playSoundEffect(const char *baseSoundName) { if (scumm_stricmp(baseSoundName+4, "loop") == 0) _loopingAudioName = Common::String(baseSoundName); - if (!_vm->_sfxEnabled || !_vm->_audioEnabled) + if (!_vm->_sfxEnabled || !_vm->_sfxWorking) return; /* |