[Scummvm-git-logs] scummvm master -> 2f851edfc2f620ab7aae01bda0b4228b1ed5d139

bgK bastien.bouclet at gmail.com
Sun Oct 7 16:13:39 CEST 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:
2f851edfc2 MOHAWK: Show the closed gate on the 3rd channelwood level


Commit: 2f851edfc2f620ab7aae01bda0b4228b1ed5d139
    https://github.com/scummvm/scummvm/commit/2f851edfc2f620ab7aae01bda0b4228b1ed5d139
Author: Bastien Bouclet (bastien.bouclet at gmail.com)
Date: 2018-10-07T16:12:22+02:00

Commit Message:
MOHAWK: Show the closed gate on the 3rd channelwood level

The original game scripts are missing a delay.
Fixes #10727.

Changed paths:
    engines/mohawk/myst_scripts.cpp


diff --git a/engines/mohawk/myst_scripts.cpp b/engines/mohawk/myst_scripts.cpp
index fa5d395..5cd4e81 100644
--- a/engines/mohawk/myst_scripts.cpp
+++ b/engines/mohawk/myst_scripts.cpp
@@ -600,6 +600,15 @@ void MystScriptParser::o_copyBackBufferToScreen(uint16 var, const ArgumentsArray
 	debugC(kDebugScript, "\trect.bottom: %d", rect.bottom);
 
 	_vm->_gfx->copyBackBufferToScreen(rect);
+
+	// WORKAROUND: On Channelwood, wait for the sound to complete when
+	// closing the gate on the third level near the blue page.
+	// Fixes the gate not changing visual state despite the closing
+	// sound playing.
+	// There is one card id per side of the gate.
+	if (_vm->getCard()->getId() == 3481 || _vm->getCard()->getId() == 3522) {
+		soundWaitStop();
+	}
 }
 
 void MystScriptParser::o_copyImageToBackBuffer(uint16 var, const ArgumentsArray &args) {





More information about the Scummvm-git-logs mailing list