[Scummvm-git-logs] scummvm master -> 1d67ba66681e30237d7aa7bc3175daff4ad03b5d

sluicebox 22204938+sluicebox at users.noreply.github.com
Tue Aug 18 10:09:26 UTC 2020


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:
1d67ba6668 SCI: PalVary includes palette entries 0 and 255


Commit: 1d67ba66681e30237d7aa7bc3175daff4ad03b5d
    https://github.com/scummvm/scummvm/commit/1d67ba66681e30237d7aa7bc3175daff4ad03b5d
Author: sluicebox (22204938+sluicebox at users.noreply.github.com)
Date: 2020-08-18T03:07:18-07:00

Commit Message:
SCI: PalVary includes palette entries 0 and 255

Fixes color 0 in QFG1VGA at night. This is the menu bar background.

QFG1VGA uses a soft black (27,27,27) for color 0 during the day and
regular black (0,0,0) at night. Until recently, ScummVM didn't display
the soft black, because it didn't include color 0 when copying pic
palettes to the system palette. Now that color 0 is included, it's
exposed that PalVary has been excluding colors 0 and 255 when
calculating the new palette, preventing QFG1VGA's soft black from
transitioning to regular black at night.

SSCI includes all entries when calculating the new palette.

Changed paths:
    engines/sci/graphics/palette.cpp


diff --git a/engines/sci/graphics/palette.cpp b/engines/sci/graphics/palette.cpp
index 0cea495d83..644d5b0edd 100644
--- a/engines/sci/graphics/palette.cpp
+++ b/engines/sci/graphics/palette.cpp
@@ -929,7 +929,7 @@ void GfxPalette::palVaryProcess(int signal, bool setPalette) {
 	// Calculate inbetween palette
 	Color inbetween;
 	int16 color;
-	for (int colorNr = 1; colorNr < 255; colorNr++) {
+	for (int colorNr = 0; colorNr < 256; colorNr++) {
 		inbetween.used = _sysPalette.colors[colorNr].used;
 		color = _palVaryTargetPalette.colors[colorNr].r - _palVaryOriginPalette.colors[colorNr].r;
 		inbetween.r = ((color * _palVaryStep) / 64) + _palVaryOriginPalette.colors[colorNr].r;




More information about the Scummvm-git-logs mailing list