From ab1b04055aad3b7ca8c7d1d3e975bfa061e6a0a8 Mon Sep 17 00:00:00 2001 From: Jonathan G Rennison Date: Thu, 8 Mar 2018 21:30:02 +0000 Subject: [PATCH] Fix incorrect handling of over-brightness in non-SSE 32bpp blitter. --- src/blitter/32bpp_base.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/blitter/32bpp_base.cpp b/src/blitter/32bpp_base.cpp index f0f4cd04ab..47e119f067 100644 --- a/src/blitter/32bpp_base.cpp +++ b/src/blitter/32bpp_base.cpp @@ -175,12 +175,12 @@ Colour Blitter_32bppBase::ReallyAdjustBrightness(Colour colour, uint8 brightness { assert(DEFAULT_BRIGHTNESS == 1 << 7); - uint64 combined = (((uint64) colour.r) << 32) | (colour.g << 16) | colour.b; + uint64 combined = (((uint64) colour.r) << 32) | (((uint64) colour.g) << 16) | ((uint64) colour.b); combined *= brightness; - uint16 r = GB(combined, 39, 8); - uint16 g = GB(combined, 23, 8); - uint16 b = GB(combined, 7, 8); + uint16 r = GB(combined, 39, 9); + uint16 g = GB(combined, 23, 9); + uint16 b = GB(combined, 7, 9); if ((combined & 0x800080008000L) == 0L) { return Colour(r, g, b, colour.a);