thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

SHERLOCK: Rework use of music flags

Browse source
This commit is contained in:
Strangerke 2015-05-22 22:23:40 +02:00
parent 2db07a9d39
commit 1e58f3d925
6 changed files with 26 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

14
engines/sherlock/sound.cpp
View file

@ -52,7 +52,7 @@ static const uint8 creativeADPCM_AdjustMap[64] = {
Sound::Sound(SherlockEngine *vm, Audio::Mixer *mixer) : _vm(vm), _mixer(mixer) {
_digitized = false;
_music = false;
_musicPlaying = false;
_voices = 0;
_diskSoundPlaying = false;
_soundPlaying = false;
@ -78,7 +78,7 @@ Sound::Sound(SherlockEngine *vm, Audio::Mixer *mixer) : _vm(vm), _mixer(mixer) {
void Sound::syncSoundSettings() {
_digitized = !ConfMan.getBool("mute");
_music = !ConfMan.getBool("mute") && !ConfMan.getBool("music_mute");
_musicOn = !ConfMan.getBool("mute") && !ConfMan.getBool("music_mute");
_voices = !ConfMan.getBool("mute") && !ConfMan.getBool("speech_mute") ? 1 : 0;
}
@ -202,6 +202,9 @@ void Sound::stopSound() {
}
void Sound::playMusic(const Common::String &name) {
if (!_musicOn)
return;
// TODO
warning("Sound::playMusic %s", name.c_str());
Common::SeekableReadStream *stream = _vm->_res->load(name, "MUSIC.LIB");
@ -223,6 +226,8 @@ void Sound::playMusic(const Common::String &name) {
void Sound::stopMusic() {
// TODO
warning("TODO: Sound::stopMusic");
_musicPlaying = false;
}
int Sound::loadSong(int songNumber) {
@ -232,8 +237,13 @@ int Sound::loadSong(int songNumber) {
}
void Sound::startSong() {
if (!_musicOn)
return;
// TODO
warning("TODO: Sound::startSong");
_musicPlaying = true;
}
void Sound::freeSong() {