[Scummvm-cvs-logs] scummvm master -> 6ac4c9dedbe3d05f5424a4268c08fbaec86287d9

[Kirben]

This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
6ac4c9dedb SCUMM: Fix the lip sync animation in later HE games.


Commit: 6ac4c9dedbe3d05f5424a4268c08fbaec86287d9
    https://github.com/scummvm/scummvm/commit/6ac4c9dedbe3d05f5424a4268c08fbaec86287d9
Author: Kirben (kirben at optusnet.com.au)
Date: 2016-02-25T20:46:47+11:00

Commit Message:
SCUMM: Fix the lip sync animation in later HE games.

Changed paths:
    engines/scumm/he/sound_he.cpp



diff --git a/engines/scumm/he/sound_he.cpp b/engines/scumm/he/sound_he.cpp
index a78aff9..b806a9f 100644
--- a/engines/scumm/he/sound_he.cpp
+++ b/engines/scumm/he/sound_he.cpp
@@ -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]);
@@ -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.