[Scummvm-cvs-logs] scummvm master -> da3f6708984043322bd8e97535dd461977376417

[bgK]

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:
da3f670898 MOHAWK: Compensate movie encoding difference between Myst ME and Myst original, to fix a crash in the clock tower.


Commit: da3f6708984043322bd8e97535dd461977376417
    https://github.com/scummvm/scummvm/commit/da3f6708984043322bd8e97535dd461977376417
Author: Bastien Bouclet (bastien.bouclet at gmail.com)
Date: 2011-05-19T13:06:37-07:00

Commit Message:
MOHAWK: Compensate movie encoding difference between Myst ME and Myst original, to fix a crash in the clock tower.

Changed paths:
    engines/mohawk/myst_stacks/myst.cpp



diff --git a/engines/mohawk/myst_stacks/myst.cpp b/engines/mohawk/myst_stacks/myst.cpp
index f77ae75..70abf0c 100644
--- a/engines/mohawk/myst_stacks/myst.cpp
+++ b/engines/mohawk/myst_stacks/myst.cpp
@@ -2839,11 +2839,17 @@ void Myst::clockGearForwardOneStep(uint16 gear) {
 }
 
 void Myst::clockWeightDownOneStep() {
+	// The Myst ME version of this video is encoded faster than the original
+	// The weight goes on the floor one step too early. Original ME engine also has this behavior.
+	bool updateVideo = !(_vm->getFeatures() & GF_ME) || _clockWeightPosition < (2214 - 246);
+
 	// Set video bounds
-	_clockWeightVideo = _vm->_video->playMovie(_vm->wrapMovieFilename("cl1wlfch", kMystStack) , 124, 0);
-	_vm->_video->setVideoBounds(_clockWeightVideo,
-			Audio::Timestamp(0, _clockWeightPosition, 600),
-			Audio::Timestamp(0, _clockWeightPosition + 246, 600));
+	if (updateVideo) {
+		_clockWeightVideo = _vm->_video->playMovie(_vm->wrapMovieFilename("cl1wlfch", kMystStack) , 124, 0);
+		_vm->_video->setVideoBounds(_clockWeightVideo,
+				Audio::Timestamp(0, _clockWeightPosition, 600),
+				Audio::Timestamp(0, _clockWeightPosition + 246, 600));
+	}
 
 	// Increment value by one step
 	_clockWeightPosition += 246;