[Scummvm-git-logs] scummvm master -> 67bf2d1925c87c2fc37fb51f6a07b64d7da33f65

[djsrv]

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:
67bf2d1925 DIRECTOR: LINGO: Move perFrameHook call


Commit: 67bf2d1925c87c2fc37fb51f6a07b64d7da33f65
    https://github.com/scummvm/scummvm/commit/67bf2d1925c87c2fc37fb51f6a07b64d7da33f65
Author: djsrv (dservilla at gmail.com)
Date: 2020-06-26T17:13:04-04:00

Commit Message:
DIRECTOR: LINGO: Move perFrameHook call

I removed the TODO without moving it to the right place...

Changed paths:
    engines/director/score.cpp


diff --git a/engines/director/score.cpp b/engines/director/score.cpp
index 2d4e5d47f6..a2cbef2948 100644
--- a/engines/director/score.cpp
+++ b/engines/director/score.cpp
@@ -430,12 +430,6 @@ void Score::update() {
 
 	// For previous frame
 	if (_currentFrame > 0 && !_vm->_playbackPaused) {
-		// If there is a transition, the perFrameHook is called
-		// after each transition subframe instead.
-		if (_frames[_currentFrame]->_transType == 0) {
-			_lingo->executePerFrameHook(_currentFrame, 0);
-		}
-
 		// When Lingo::func_goto* is called, _nextFrame is set
 		// and _skipFrameAdvance is set to true.
 		// However, the exitFrame event can overwrite the value
@@ -450,6 +444,12 @@ void Score::update() {
 		} else {
 			_lingo->processEvent(kEventExitFrame);
 		}
+
+		// If there is a transition, the perFrameHook is called
+		// after each transition subframe instead.
+		if (_frames[_currentFrame]->_transType == 0) {
+			_lingo->executePerFrameHook(_currentFrame, 0);
+		}
 	}
 
 	if (!_vm->_playbackPaused) {