aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authoruruk2014-07-24 19:44:09 +0200
committeruruk2014-07-24 19:44:09 +0200
commit7c65aa7aecef35e77c0f39c0e2c2a864858e6b9d (patch)
tree60fc615454e15f71c66baffa8afed6331b603299
parent6743b8b6a3199cc75518e2c05625b76db361484f (diff)
downloadscummvm-rg350-7c65aa7aecef35e77c0f39c0e2c2a864858e6b9d.tar.gz
scummvm-rg350-7c65aa7aecef35e77c0f39c0e2c2a864858e6b9d.tar.bz2
scummvm-rg350-7c65aa7aecef35e77c0f39c0e2c2a864858e6b9d.zip
CGE2: Repair/rename checkSoundHandle().
-rw-r--r--engines/cge2/cge2_main.cpp2
-rw-r--r--engines/cge2/sound.cpp4
-rw-r--r--engines/cge2/sound.h2
3 files changed, 4 insertions, 4 deletions
diff --git a/engines/cge2/cge2_main.cpp b/engines/cge2/cge2_main.cpp
index 24adb0e0ae..e4b34a001c 100644
--- a/engines/cge2/cge2_main.cpp
+++ b/engines/cge2/cge2_main.cpp
@@ -554,7 +554,7 @@ void CGE2Engine::mainLoop() {
}
void CGE2Engine::checkSounds() {
- _sound->checkSoundHandle();
+ _sound->checkSoundHandles();
checkSaySwitch();
checkMusicSwitch();
_midiPlayer->syncVolume();
diff --git a/engines/cge2/sound.cpp b/engines/cge2/sound.cpp
index 27a3af826c..cc148d6090 100644
--- a/engines/cge2/sound.cpp
+++ b/engines/cge2/sound.cpp
@@ -119,8 +119,8 @@ void Sound::stop() {
_audioStream = nullptr;
}
-void Sound::checkSoundHandle() {
- if (!_vm->_mixer->isSoundHandleActive(_speechHandle))
+void Sound::checkSoundHandles() {
+ if (!_vm->_mixer->isSoundHandleActive(_speechHandle) && !_vm->_mixer->isSoundHandleActive(_soundHandle))
_smpinf._counter = 0;
}
diff --git a/engines/cge2/sound.h b/engines/cge2/sound.h
index 7dd549ca16..b97cd11bd0 100644
--- a/engines/cge2/sound.h
+++ b/engines/cge2/sound.h
@@ -76,7 +76,7 @@ public:
int16 getRepeat();
void setRepeat(int16 count);
void stop();
- void checkSoundHandle();
+ void checkSoundHandles();
private:
int _soundRepeatCount;
CGE2Engine *_vm;