[Scummvm-git-logs] scummvm master -> 7f6ab969bab0b1e47ac7655dd65b071b936aa72c

[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:
7f6ab969ba SWORD1: Fix palette flashing issues after quitting video early


Commit: 7f6ab969bab0b1e47ac7655dd65b071b936aa72c
    https://github.com/scummvm/scummvm/commit/7f6ab969bab0b1e47ac7655dd65b071b936aa72c
Author: AndywinXp (andywinxp at gmail.com)
Date: 2023-09-23T14:28:01+02:00

Commit Message:
SWORD1: Fix palette flashing issues after quitting video early

This was discovered by the speedrunning community.

Changed paths:
    engines/sword1/logic.cpp


diff --git a/engines/sword1/logic.cpp b/engines/sword1/logic.cpp
index dbbaf2e3608..d005adb2669 100644
--- a/engines/sword1/logic.cpp
+++ b/engines/sword1/logic.cpp
@@ -975,6 +975,13 @@ int Logic::fnPlaySequence(Object *cpt, int32 id, int32 sequenceId, int32 d, int3
 		if (player->load(sequenceId))
 			player->play();
 		delete player;
+
+		// In some instances, when you start a video when the palette is still fading
+		// and the video is finished earlier, another palette fade(-out) is performed with the
+		// wrong palette. This happens when traveling to Spain or Ireland. It couldn't happen
+		// in the original, as it asked for the CD before loading the scene.
+		// Let's fix this by forcing a black fade palette.
+		_screen->fnSetFadeTargetPalette(0, 255, 0, BORDER_BLACK);
 	}
 	return SCRIPT_CONT;
 }