[Scummvm-git-logs] scummvm master -> 76c18ee7b334ab6fd351dd943cd42b5d84db0670

[AndywinXp]

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:
76c18ee7b3 SCUMM: MM/ZAK: Fix iris transition timing for C64 versions


Commit: 76c18ee7b334ab6fd351dd943cd42b5d84db0670
    https://github.com/scummvm/scummvm/commit/76c18ee7b334ab6fd351dd943cd42b5d84db0670
Author: AndywinXp (andywinxp at gmail.com)
Date: 2022-12-10T20:45:35+01:00

Commit Message:
SCUMM: MM/ZAK: Fix iris transition timing for C64 versions

Changed paths:
    engines/scumm/gfx.cpp


diff --git a/engines/scumm/gfx.cpp b/engines/scumm/gfx.cpp
index 0d899742557..b8febc95ad0 100644
--- a/engines/scumm/gfx.cpp
+++ b/engines/scumm/gfx.cpp
@@ -70,7 +70,8 @@ enum {
 	// the screen effect (like sound interrupts running,
 	// forcing the SCUMM timer to a lower frequency).
 	// I have added an extra quarter frame to emulate that.
-	kPictureDelay = 4
+	kPictureDelay = 4,
+	kC64Delay = 6
 };
 
 #define NUM_SHAKE_POSITIONS 8
@@ -4201,7 +4202,9 @@ void ScummEngine::transitionEffect(int a) {
 	const int height = MIN((int)_virtscr[kMainVirtScreen].h, _screenHeight);
 
 	if (VAR_FADE_DELAY == 0xFF) {
-		if (_game.version >= 2) {
+		if (_game.platform == Common::kPlatformC64) {
+			delay = kC64Delay;
+		} else if (_game.version >= 2) {
 			delay = kPictureDelay;
 		} else {
 			delay = kNoDelay;