[Scummvm-git-logs] scummvm branch-2-8 -> 3cee7c6dcf625e132fb9ae53687e8d52630a5d78

sev- noreply at scummvm.org
Thu Dec 14 21:48:45 UTC 2023


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


Commit: 3cee7c6dcf625e132fb9ae53687e8d52630a5d78
    https://github.com/scummvm/scummvm/commit/3cee7c6dcf625e132fb9ae53687e8d52630a5d78
Author: Scott Percival (code at moral.net.au)
Date: 2023-12-14T22:48:41+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;
 	}
 




More information about the Scummvm-git-logs mailing list