aboutsummaryrefslogtreecommitdiff
path: root/engines/saga/music.cpp
diff options
context:
space:
mode:
authorChristopher Page2008-07-01 03:01:11 +0000
committerChristopher Page2008-07-01 03:01:11 +0000
commit9c60fd183c8bc8f867a5dd5116c1195586342db6 (patch)
treede4ad9a356ea83bd9b009f1039b5fb21834ef890 /engines/saga/music.cpp
parent563e28b668a44e830c26702b21f1d75cccb6cf03 (diff)
downloadscummvm-rg350-9c60fd183c8bc8f867a5dd5116c1195586342db6.tar.gz
scummvm-rg350-9c60fd183c8bc8f867a5dd5116c1195586342db6.tar.bz2
scummvm-rg350-9c60fd183c8bc8f867a5dd5116c1195586342db6.zip
Sound settings for Saga can be configured from the GMM
svn-id: r32863
Diffstat (limited to 'engines/saga/music.cpp')
-rw-r--r--engines/saga/music.cpp14
1 files changed, 3 insertions, 11 deletions
diff --git a/engines/saga/music.cpp b/engines/saga/music.cpp
index 732bd0b50c..1005b0ab5f 100644
--- a/engines/saga/music.cpp
+++ b/engines/saga/music.cpp
@@ -346,7 +346,7 @@ void MusicPlayer::stopMusic() {
}
}
-Music::Music(SagaEngine *vm, Audio::Mixer *mixer, MidiDriver *driver, int enabled) : _vm(vm), _mixer(mixer), _enabled(enabled), _adlib(false) {
+Music::Music(SagaEngine *vm, Audio::Mixer *mixer, MidiDriver *driver) : _vm(vm), _mixer(mixer), _adlib(false) {
_player = new MusicPlayer(driver);
_currentVolume = 0;
@@ -432,11 +432,7 @@ void Music::play(uint32 resourceId, MusicFlags flags) {
uint32 loopStart;
debug(2, "Music::play %d, %d", resourceId, flags);
-
- if (!_enabled) {
- return;
- }
-
+
if (isPlaying() && _trackNumber == resourceId) {
return;
}
@@ -444,11 +440,7 @@ void Music::play(uint32 resourceId, MusicFlags flags) {
_trackNumber = resourceId;
_player->stopMusic();
_mixer->stopHandle(_musicHandle);
-
- if (!_vm->_musicVolume) {
- return;
- }
-
+
int realTrackNumber;
if (_vm->getGameType() == GType_ITE) {