[Scummvm-git-logs] scummvm master -> fc0f83ef9bb992482ab5d43fcc6eeac42ec8424b

athrxx athrxx at scummvm.org
Fri Nov 2 16:49:43 CET 2018


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:
fc0f83ef9b KYRA: fix EOB II sound glitch


Commit: fc0f83ef9bb992482ab5d43fcc6eeac42ec8424b
    https://github.com/scummvm/scummvm/commit/fc0f83ef9bb992482ab5d43fcc6eeac42ec8424b
Author: athrxx (athrxx at scummvm.org)
Date: 2018-11-02T16:47:30+01:00

Commit Message:
KYRA: fix EOB II sound glitch

This is a workaround for a premature sfx (original code/script bug) in a specific sequence in catacombs level 2.

Changed paths:
    engines/kyra/eobcommon.cpp


diff --git a/engines/kyra/eobcommon.cpp b/engines/kyra/eobcommon.cpp
index b888752..d5327c8 100644
--- a/engines/kyra/eobcommon.cpp
+++ b/engines/kyra/eobcommon.cpp
@@ -1397,7 +1397,12 @@ void EoBCoreEngine::initDialogueSequence() {
 	gui_updateControls();
 	//_allowSkip = true;
 
-	snd_stopSound();
+	// WORKAROUND for bug in the original code (all platforms). Sequence sound would be terminated prematurely.
+	if (_flags.gameID == GI_EOB2 && _currentLevel == 2 && _currentBlock == 654)
+		_sound->stopAllSoundEffects();
+	else
+		snd_stopSound();
+
 	Common::SeekableReadStream *s = _res->createReadStream("TEXT.DAT");
 	_screen->loadFileDataToPage(s, 5, 32000);
 	_txt->setupField(9, 0);





More information about the Scummvm-git-logs mailing list