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

[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:
d3e3f3a714 DIRECTOR: Add D4 workaround for freezing behaviour fix


Commit: d3e3f3a7141af1af251f5eff76d00ed1ad7c4648
    https://github.com/scummvm/scummvm/commit/d3e3f3a7141af1af251f5eff76d00ed1ad7c4648
Author: Scott Percival (code at moral.net.au)
Date: 2023-12-14T22:48:30+01:00

Commit Message:
DIRECTOR: Add D4 workaround for freezing behaviour fix

Freezing changed pretty significantly in D4, so it figures that the
conditions for a frame update would change with it.

Fixes regression where loading save games in The Dark Eye would result
in a white screen.

Changed paths:
    engines/director/score.cpp


diff --git a/engines/director/score.cpp b/engines/director/score.cpp
index c1f6b01aceb..9b436664487 100644
--- a/engines/director/score.cpp
+++ b/engines/director/score.cpp
@@ -541,7 +541,9 @@ void Score::update() {
 			}
 		}
 		// If another frozen state gets triggered, wait another update() before thawing
-		if (_window->frozenLingoStateCount() > 0)
+		if ((_vm->getVersion() < 400) && _window->frozenLingoStateCount() > 0)
+			return;
+		else if ((_vm->getVersion() >= 400) && _window->frozenLingoStateCount() > count)
 			return;
 	}