From ff9dc4ab248e47c15076dd822b635927f7b27161 Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Mon, 12 Nov 2012 20:09:29 +1100
Subject: HOPKINS: Bugfix for freeze when looking at the cat when voices are
 turned on.

---
 engines/hopkins/sound.h | 19 +++++++++++++------
 1 file changed, 13 insertions(+), 6 deletions(-)

(limited to 'engines/hopkins/sound.h')

diff --git a/engines/hopkins/sound.h b/engines/hopkins/sound.h
index 88cecbbea7..36184715ba 100644
--- a/engines/hopkins/sound.h
+++ b/engines/hopkins/sound.h
@@ -35,7 +35,6 @@ class VoiceItem {
 public:
 	int _status;
 	int _wavIndex;
-	Audio::RewindableAudioStream *_audioStream;
 	int fieldC;
 	int field14;
 };
@@ -96,6 +95,18 @@ private:
 	void PLAY_SAMPLE_SDL(int voiceIndex, int wavIndex);
 	void LOAD_MSAMPLE(int mwavIndex, const Common::String &file);
 	void DEL_MSAMPLE(int mwavIndex);
+
+	/**
+	 * Checks the music structure to see if music playback is active, and whether
+	 * it needs to move to the next WAV file
+	 */
+	void checkMusic();
+
+	/**
+	 * Checks voices to see if they're finished
+	 */
+	void checkVoices();
+
 public:
 	int SPECIAL_SOUND;
 	int SOUNDVOL;
@@ -137,11 +148,6 @@ public:
 	void STOP_MUSIC();
 	void DEL_MUSIC();
 
-	/**
-	 * Checks the music structure to see if music playback is active, and whether
-	 * it needs to move to the next WAV file
-	 */
-	void checkMusic();
 
 	bool VOICE_MIX(int voiceId, int voiceMode);
 	void DEL_SAMPLE(int soundIndex);
@@ -156,6 +162,7 @@ public:
 	
 	void syncSoundSettings();
 	void updateScummVMSoundSettings();
+	void checkSounds();
 };
 
 } // End of namespace Hopkins
-- 
cgit v1.2.3