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

[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:
bc619e59ee DIRECTOR: LINGO: Don't trigger exitFrame on b_go


Commit: bc619e59ee3625f504feae806f9e3efb21011cdb
    https://github.com/scummvm/scummvm/commit/bc619e59ee3625f504feae806f9e3efb21011cdb
Author: djsrv (dservilla at gmail.com)
Date: 2020-08-14T14:59:17-04:00

Commit Message:
DIRECTOR: LINGO: Don't trigger exitFrame on b_go

Changed paths:
    engines/director/score.cpp


diff --git a/engines/director/score.cpp b/engines/director/score.cpp
index 93505c3d51..6b3645c79a 100644
--- a/engines/director/score.cpp
+++ b/engines/director/score.cpp
@@ -329,19 +329,9 @@ void Score::update() {
 	if (_currentFrame > 0 && !_vm->_playbackPaused) {
 		// When Lingo::func_goto* is called, _nextFrame is set
 		// and _skipFrameAdvance is set to true.
-		// However, the exitFrame event can overwrite the value
-		// for _nextFrame before it can be used.
-		// Because we still want to call exitFrame, we check if
-		// a goto call has been made and if so, cache the value
-		// of _nextFrame so it doesn't get wiped.
-		if (_vm->_skipFrameAdvance) {
-			uint16 nextFrameCache = _nextFrame;
-			if (_vm->getVersion() >= 400)
-				_movie->processEvent(kEventExitFrame);
-			_nextFrame = nextFrameCache;
-		} else {
-			if (_vm->getVersion() >= 400)
-				_movie->processEvent(kEventExitFrame);
+		// exitFrame is not called in this case.
+		if (!_vm->_skipFrameAdvance && _vm->getVersion() >= 400) {
+			_movie->processEvent(kEventExitFrame);
 		}
 
 		// If there is a transition, the perFrameHook is called