From 7c65aa7aecef35e77c0f39c0e2c2a864858e6b9d Mon Sep 17 00:00:00 2001
From: uruk
Date: Thu, 24 Jul 2014 19:44:09 +0200
Subject: CGE2: Repair/rename checkSoundHandle().

---
 engines/cge2/cge2_main.cpp | 2 +-
 engines/cge2/sound.cpp     | 4 ++--
 engines/cge2/sound.h       | 2 +-
 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;
-- 
cgit v1.2.3