[Scummvm-git-logs] scummvm master -> 70bbe562c360c7951608859aae9e2d723ad5d5e9

[sev-]

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:
70bbe562c3 DIRECTOR: Rebuild frames when there is jump to current frame


Commit: 70bbe562c360c7951608859aae9e2d723ad5d5e9
    https://github.com/scummvm/scummvm/commit/70bbe562c360c7951608859aae9e2d723ad5d5e9
Author: Harishankar Kumar (hari01584 at gmail.com)
Date: 2023-07-22T01:06:45+02:00

Commit Message:
DIRECTOR: Rebuild frames when there is jump to current frame

Initially, the frames data were only being reset and rebuild when
jumps were made to frame that is different than current one, ie
this in case when `_nextFrame != _curFrameNumber`, this however
had problems with `majestic-mac` not opening and stuck on loading
screen.

Fixed problem where `majestic-mac` would constantly jump to main-menu
screen (ie same frame) and would not load the game.

Changed paths:
    engines/director/score.cpp


diff --git a/engines/director/score.cpp b/engines/director/score.cpp
index 62aca05f9fd..0312a53b461 100644
--- a/engines/director/score.cpp
+++ b/engines/director/score.cpp
@@ -405,8 +405,7 @@ void Score::update() {
 		if (_nextFrame) {
 			// With the advent of demand loading frames and due to partial updates, we rebuild our channel data
 			// when jumping.
-			if (_nextFrame != _curFrameNumber)
-				rebuildChannelData(_nextFrame);
+			rebuildChannelData(_nextFrame);
 			_curFrameNumber = _nextFrame;
 		}
 		else if (!_window->_newMovieStarted)