[Scummvm-git-logs] scummvm master -> 5322606abe2bdcfc85f5d90036ad09610e29ca6f

[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:
5322606abe MOHAWK: RIVEN: Execute the stored opcode before resetting movies


Commit: 5322606abe2bdcfc85f5d90036ad09610e29ca6f
    https://github.com/scummvm/scummvm/commit/5322606abe2bdcfc85f5d90036ad09610e29ca6f
Author: Bastien Bouclet (bastien.bouclet at gmail.com)
Date: 2018-02-05T07:40:20+01:00

Commit Message:
MOHAWK: RIVEN: Execute the stored opcode before resetting movies

Otherwise the movie position is zero which leads the comparison with the
stored opcode position to always be false.
Fixes #10426, a regression from cf1171d4d9b43eba.

Changed paths:
    engines/mohawk/riven_video.cpp


diff --git a/engines/mohawk/riven_video.cpp b/engines/mohawk/riven_video.cpp
index 9bd185e..745f96b 100644
--- a/engines/mohawk/riven_video.cpp
+++ b/engines/mohawk/riven_video.cpp
@@ -252,12 +252,6 @@ void RivenVideo::playBlocking(int32 endTime) {
 		}
 	}
 
-	if (playTillEnd) {
-		disable();
-		stop();
-		seek(0);
-	}
-
 	// Execute the stored opcode
 	uint16 storedOpcodeMovieSlot = _vm->_scriptMan->getStoredMovieOpcodeSlot();
 	uint32 storedOpcodeTime = _vm->_scriptMan->getStoredMovieOpcodeTime();
@@ -265,6 +259,12 @@ void RivenVideo::playBlocking(int32 endTime) {
 		_vm->_scriptMan->runStoredMovieOpcode();
 	}
 
+	if (playTillEnd) {
+		disable();
+		stop();
+		seek(0);
+	}
+
 	_vm->_cursor->showCursor();
 }