diff options
| author | Travis Howell | 2002-09-11 13:28:34 +0000 |
|---|---|---|
| committer | Travis Howell | 2002-09-11 13:28:34 +0000 |
| commit | 004c6ddec95b6c6a3f1068b8f873c485a38b8911 (patch) | |
| tree | a9f1dcfb2c52e41b23385ded55da5d226479baac /scumm/sound.h | |
| parent | f26cd0e2b2f5271249d4dab130bb5d5748f279ab (diff) | |
| download | scummvm-rg350-004c6ddec95b6c6a3f1068b8f873c485a38b8911.tar.gz scummvm-rg350-004c6ddec95b6c6a3f1068b8f873c485a38b8911.tar.bz2 scummvm-rg350-004c6ddec95b6c6a3f1068b8f873c485a38b8911.zip | |
Commited the following patches
[ 606595 ] Fix for Sam & Max animation glitch
[ 607175 ] Possible fix for bug #590511
[ 607677 ] Partial workaround for bug #566062
[ 607713 ] patch for bug 580350 (MI2 F5 crash)
svn-id: r4924
Diffstat (limited to 'scumm/sound.h')
| -rw-r--r-- | scumm/sound.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/scumm/sound.h b/scumm/sound.h index 73dc23eeed..39aba83778 100644 --- a/scumm/sound.h +++ b/scumm/sound.h @@ -56,6 +56,7 @@ enum { File *_sfxFile; uint32 _talk_sound_a, _talk_sound_b; byte _talk_sound_mode; + int _talk_sound_frame; bool _mouthSyncMode; bool _endOfMouthSync; uint16 _mouthSyncTimes[52]; @@ -107,7 +108,7 @@ public: void stopAllSounds(); void clearSoundQue(); void soundKludge(int16 * list); - void talkSound(uint32 a, uint32 b, int mode); + void talkSound(uint32 a, uint32 b, int mode, int frame); void setupSound(); void pauseSounds(bool pause); int startSfxSound(File *file, int file_size); |