From d447f057094084f55b19a9806ce70a3ed44b96c6 Mon Sep 17 00:00:00 2001
From: James Brown
Date: Mon, 22 Apr 2002 08:16:16 +0000
Subject: Add voice channel tracking to stop script race in BumpusVille VR.

svn-id: r4048
---
 scumm.h | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

(limited to 'scumm.h')

diff --git a/scumm.h b/scumm.h
index 8c522c8708..86299ec4fc 100644
--- a/scumm.h
+++ b/scumm.h
@@ -1002,10 +1002,10 @@ public:
 	void clearSoundQue();
 	void talkSound(uint32 a, uint32 b, int mode);
 	void processSfxQueues();
-	void startTalkSound(uint32 a, uint32 b, int mode);
+	int startTalkSound(uint32 a, uint32 b, int mode);
 	void stopTalkSound();
 	bool isMouthSyncOff(uint pos);
-	void startSfxSound(void *file, int size);
+	int startSfxSound(void *file, int size);
 	void *openSfxFile();
 	void addSoundToQueue(int sound);
 	void addSoundToQueue2(int sound);
@@ -1016,10 +1016,11 @@ public:
 	void pauseSounds(bool pause);
 	bool isSfxFinished();
 	void playBundleSound(char *sound);
-	void playSfxSound(void *sound, uint32 size, uint rate);
+	int playSfxSound(void *sound, uint32 size, uint rate);
  	void playSfxSound_MP3(void *sound, uint32 size);
 	void stopSfxSound();
 
+	int _talkChannel;	/* Mixer channel actor is talking on */
 	bool _useTalkAnims;
 	uint16 _defaultTalkDelay;
 	byte _haveMsg;
-- 
cgit v1.2.3