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

[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:
ab0fc404c1 DIRECTOR: Process stepMovie events if outdated Lingo is allowed


Commit: ab0fc404c121017a4989dff734bfc5b8ab630519
    https://github.com/scummvm/scummvm/commit/ab0fc404c121017a4989dff734bfc5b8ab630519
Author: djsrv (dservilla at gmail.com)
Date: 2021-07-23T18:08:53-04:00

Commit Message:
DIRECTOR: Process stepMovie events if outdated Lingo is allowed

Used in Meet MediaBand.

Changed paths:
    engines/director/lingo/lingo-events.cpp
    engines/director/score.cpp


diff --git a/engines/director/lingo/lingo-events.cpp b/engines/director/lingo/lingo-events.cpp
index fef73ac9a7..bbfe666d9c 100644
--- a/engines/director/lingo/lingo-events.cpp
+++ b/engines/director/lingo/lingo-events.cpp
@@ -297,6 +297,7 @@ void Movie::registerEvent(LEvent event, int targetId) {
 
 		case kEventStartUp:
 		case kEventStartMovie:
+		case kEventStepMovie:
 		case kEventStopMovie:
 		case kEventTimeout:
 		case kEventPrepareMovie:
diff --git a/engines/director/score.cpp b/engines/director/score.cpp
index 5db7f1725c..f4a0d9b7e7 100644
--- a/engines/director/score.cpp
+++ b/engines/director/score.cpp
@@ -421,8 +421,8 @@ void Score::update() {
 	// Enter and exit from previous frame
 	if (!_vm->_playbackPaused) {
 		_movie->processEvent(kEventEnterFrame); // Triggers the frame script in D2-3, explicit enterFrame handlers in D4+
-		if (_vm->getVersion() >= 300 && _vm->getVersion() < 400) {
-			// Movie version of enterFrame, for D3 only. The Lingo Dictionary claims
+		if ((_vm->getVersion() >= 300 && _vm->getVersion() < 400) || _movie->_allowOutdatedLingo) {
+			// Movie version of enterFrame, for D3 only. The D3 Interactivity Manual claims
 			// "This handler executes before anything else when the playback head moves."
 			// but this is incorrect. The frame script is executed first.
 			_movie->processEvent(kEventStepMovie);