aboutsummaryrefslogtreecommitdiff
path: root/scumm.h
diff options
context:
space:
mode:
authorJames Brown2002-04-22 08:16:16 +0000
committerJames Brown2002-04-22 08:16:16 +0000
commitd447f057094084f55b19a9806ce70a3ed44b96c6 (patch)
treeff83e720762c0353cca39182427f86f1e27f3996 /scumm.h
parentd0d33166345bbe1d98d4e3b766af2b74713f0fc7 (diff)
downloadscummvm-rg350-d447f057094084f55b19a9806ce70a3ed44b96c6.tar.gz
scummvm-rg350-d447f057094084f55b19a9806ce70a3ed44b96c6.tar.bz2
scummvm-rg350-d447f057094084f55b19a9806ce70a3ed44b96c6.zip
Add voice channel tracking to stop script race in BumpusVille VR.
svn-id: r4048
Diffstat (limited to 'scumm.h')
-rw-r--r--scumm.h7
1 files changed, 4 insertions, 3 deletions
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;