[Scummvm-git-logs] scummvm master -> 35abb6737885075ef5b295de32608329076b8d99

[athrxx]

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

Summary:
1d5fd780ce KYRA: (HOF) - fix bug #3721 (Sound and speech plays at the same time)
35abb67378 KYRA: (HOF) - minor fix to anim coords (bug #11321)


Commit: 1d5fd780cec9e181a35a389b14380ab3c75c4c59
    https://github.com/scummvm/scummvm/commit/1d5fd780cec9e181a35a389b14380ab3c75c4c59
Author: athrxx (athrxx at scummvm.org)
Date: 2020-01-25T13:08:39+01:00

Commit Message:
KYRA: (HOF) - fix bug #3721 (Sound and speech plays at the same time)

Changed paths:
    engines/kyra/engine/kyra_hof.cpp


diff --git a/engines/kyra/engine/kyra_hof.cpp b/engines/kyra/engine/kyra_hof.cpp
index c853fcb..43849d5 100644
--- a/engines/kyra/engine/kyra_hof.cpp
+++ b/engines/kyra/engine/kyra_hof.cpp
@@ -1420,12 +1420,13 @@ void KyraEngine_HoF::snd_playVoiceFile(int id) {
 	sprintf(vocFile, "%07d", id);
 	if (_sound->isVoicePresent(vocFile)) {
 		// Unlike the original I have added a timeout here. I have chosen a size that makes sure that it
-		// won't get triggered in any of the bug #11309 situations, but still avoids infinite hangups if
-		// something goes wrong.
-		uint32 end = _system->getMillis() + 2500;
-		while (snd_voiceIsPlaying() && _system->getMillis() < end && !skipFlag())
+		// won't get triggered in any of the bug #11309 or bug #3721 situations, but still avoids infinite
+		// hangups if something goes wrong.
+		uint32 timeout = _system->getMillis() + 5000;
+		while (_sound->voiceIsPlaying() && _system->getMillis() < timeout && !skipFlag())
 			delay(10);
-		if (_system->getMillis() >= end && !skipFlag())
+		_chatEndTime += (_system->getMillis() + 5000 - timeout);
+		if (_system->getMillis() >= timeout && !skipFlag())
 			debugC(3, kDebugLevelSound, "KyraEngine_HoF::snd_playVoiceFile(): Speech finish wait timeout");
 
 		snd_stopVoice();


Commit: 35abb6737885075ef5b295de32608329076b8d99
    https://github.com/scummvm/scummvm/commit/35abb6737885075ef5b295de32608329076b8d99
Author: athrxx (athrxx at scummvm.org)
Date: 2020-01-25T13:08:43+01:00

Commit Message:
KYRA: (HOF) - minor fix to anim coords (bug #11321)

Changed paths:
    engines/kyra/engine/scene_hof.cpp


diff --git a/engines/kyra/engine/scene_hof.cpp b/engines/kyra/engine/scene_hof.cpp
index e4747fd..1d122a5 100644
--- a/engines/kyra/engine/scene_hof.cpp
+++ b/engines/kyra/engine/scene_hof.cpp
@@ -619,7 +619,7 @@ void KyraEngine_HoF::initSceneAnims(int unk1) {
 
 			const uint8 *shape = getShapePtr(animState->shapeIndex1);
 			animState->xPos2 -= (_screen->getShapeScaledWidth(shape, objectScale) >> 1);
-			animState->yPos2 -= (_screen->getShapeScaledHeight(shape, objectScale) >> 1);
+			animState->yPos2 -= _screen->getShapeScaledHeight(shape, objectScale);
 			animState->xPos3 = animState->xPos2;
 			animState->yPos3 = animState->yPos2;