Skip to content

Commit

Permalink
SCUMM: Fix the lip sync animation in later HE games.
Browse files Browse the repository at this point in the history
  • Loading branch information
Kirben committed Feb 25, 2016
1 parent fdcdf7e commit 6ac4c9d
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions engines/scumm/he/sound_he.cpp
View file
Expand Up @@ -636,7 +636,7 @@ void SoundHE::playHESound(int soundID, int heOffset, int heChannel, int heFlags)
if (heFlags & 1) {
_heChannel[heChannel].timer = 0;
} else {
_heChannel[heChannel].timer = size * 1000 / rate;
_heChannel[heChannel].timer = size * 1000 / (rate * blockAlign);
}

_mixer->stopHandle(_heSoundChannels[heChannel]);
Expand All @@ -658,7 +658,7 @@ void SoundHE::playHESound(int soundID, int heOffset, int heChannel, int heFlags)

_heChannel[heChannel].rate = rate;
if (_heChannel[heChannel].timer)
_heChannel[heChannel].timer = size * 1000 / rate;
_heChannel[heChannel].timer = size * 1000 / (rate * blockAlign);

// makeADPCMStream returns a stream in native endianness, but RawMemoryStream
// defaults to big endian. If we're on a little endian system, set the LE flag.
Expand Down

3 comments on commit 6ac4c9d

@lordhoto
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is this safe to go into branch-1-8? Is it worth a NEWS entry?

@Kirben
Copy link
Contributor

@Kirben Kirben commented on 6ac4c9d Feb 25, 2016

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes, it is safe to back port and worth adding to the NEWS. The lip sync animation is much better in Pajama Sam: Games to Play on Any Day, and maybe a few Backyard Sports games too.

@lordhoto
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I cherry picked the commit to branch-1-8 now as: 19bbf80

Please sign in to comment.