aboutsummaryrefslogtreecommitdiff
path: root/engines
diff options
context:
space:
mode:
authorFilippos Karapetis2007-07-31 00:52:00 +0000
committerFilippos Karapetis2007-07-31 00:52:00 +0000
commit2707e3a7e8cc02429ca73f59b488c75dbfc82500 (patch)
tree99d6c2c5486129f089b296438d8369f968037323 /engines
parent9a125828b92cae9c1b503731f29ee3712322228f (diff)
downloadscummvm-rg350-2707e3a7e8cc02429ca73f59b488c75dbfc82500.tar.gz
scummvm-rg350-2707e3a7e8cc02429ca73f59b488c75dbfc82500.tar.bz2
scummvm-rg350-2707e3a7e8cc02429ca73f59b488c75dbfc82500.zip
Music should not be played after changing scene if it's disabled from the options
svn-id: r28347
Diffstat (limited to 'engines')
-rw-r--r--engines/saga/music.cpp4
1 files changed, 4 insertions, 0 deletions
diff --git a/engines/saga/music.cpp b/engines/saga/music.cpp
index 24234864aa..710485fc05 100644
--- a/engines/saga/music.cpp
+++ b/engines/saga/music.cpp
@@ -431,6 +431,10 @@ void Music::play(uint32 resourceId, MusicFlags flags) {
_player->stopMusic();
_mixer->stopHandle(_musicHandle);
+ if (!_vm->_musicVolume) {
+ return;
+ }
+
int realTrackNumber;
if (_vm->getGameType() == GType_ITE) {