thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

SCUMM: Fix lip sync when speech is overriden

Browse source
This commit is contained in:
YYxsCnnPP 2022-06-20 22:05:57 -03:00 • committed by Filippos Karapetis
parent fb3f68f294
commit c17efa585e
1 changed files with 9 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

9
engines/scumm/he/sound_he.cpp
View file

@ -270,6 +270,11 @@ int SoundHE::getSoundVar(int sound, int var) {
return isSoundCodeUsed(sound); return isSoundCodeUsed(sound);
} }
// Disable lip sync if the speech was overriden
if (_heTalkOffset != 0) {
return 0;
}
assertRange(0, var, 25, "sound variable"); assertRange(0, var, 25, "sound variable");
int chan = -1; int chan = -1;
@ -754,6 +759,10 @@ void SoundHE::playHESound(int soundID, int heOffset, int heChannel, int heFlags,
_mixer->stopHandle(_heSoundChannels[heChannel]); _mixer->stopHandle(_heSoundChannels[heChannel]);
if (!stream) { if (!stream) {
if (soundID == 1) {
// Reset variable to signal getSoundVar that lip sync is allowed
_heTalkOffset = 0;
}
stream = Audio::makeRawStream(ptr + heOffset + 8, size, rate, flags, DisposeAfterUse::NO); stream = Audio::makeRawStream(ptr + heOffset + 8, size, rate, flags, DisposeAfterUse::NO);
} }
_mixer->playStream(type, &_heSoundChannels[heChannel], _mixer->playStream(type, &_heSoundChannels[heChannel],