diff options
author | Joost Peters | 2004-02-21 20:50:56 +0000 |
---|---|---|
committer | Joost Peters | 2004-02-21 20:50:56 +0000 |
commit | 6e50033d07011d8fcae941c5c10530081d522db0 (patch) | |
tree | dc54f1db5504e24bd9794b41eb12009d854faeb8 /queen/graphics.cpp | |
parent | 0301ccc8a88283d02b65749fd21f90e71582f14d (diff) | |
download | scummvm-rg350-6e50033d07011d8fcae941c5c10530081d522db0.tar.gz scummvm-rg350-6e50033d07011d8fcae941c5c10530081d522db0.tar.bz2 scummvm-rg350-6e50033d07011d8fcae941c5c10530081d522db0.zip |
I am an idiot.
Better fix for bug #899881 (Sounds played when sound turned off) - I forgot I added the isSpeech flag a while back. :)
svn-id: r12976
Diffstat (limited to 'queen/graphics.cpp')
-rw-r--r-- | queen/graphics.cpp | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/queen/graphics.cpp b/queen/graphics.cpp index dc7301a8f7..e845b4e6c8 100644 --- a/queen/graphics.cpp +++ b/queen/graphics.cpp @@ -343,8 +343,7 @@ void Graphics::sortBobs() { if (pbs->animating) { pbs->animOneStep(); if (pbs->frameNum > 500) { // SFX frame - if (_vm->sound()->sfxOn()) - _vm->sound()->playSfx(_vm->logic()->currentRoomSfx(), false); + _vm->sound()->playSfx(_vm->logic()->currentRoomSfx(), false); pbs->frameNum -= 500; } } @@ -1113,8 +1112,7 @@ void BamScene::playSfx() { // this problem since their playSfx() function returns immediately // if a sound is already being played. if (_lastSoundIndex == 0 || _index - _lastSoundIndex >= SFX_SKIP) { - if (_vm->sound()->sfxOn()) - _vm->sound()->playSfx(_vm->logic()->currentRoomSfx(), false); + _vm->sound()->playSfx(_vm->logic()->currentRoomSfx(), false); _lastSoundIndex = _index; } } |