From 9ab1e16b9c8e78132e85ab5160f3d3ec2d6cd242 Mon Sep 17 00:00:00 2001 From: xezon <4720891+xezon@users.noreply.github.com> Date: Sun, 11 Aug 2024 10:22:44 +0200 Subject: [PATCH] Fix operator precedence in DDSFileClass::Merge_Color --- src/w3d/renderer/ddsfile.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/w3d/renderer/ddsfile.h b/src/w3d/renderer/ddsfile.h index ecc0e456e..79431c40f 100644 --- a/src/w3d/renderer/ddsfile.h +++ b/src/w3d/renderer/ddsfile.h @@ -185,8 +185,8 @@ inline uint32_t DDSFileClass::Merge_Color(uint32_t color_a, uint32_t color_b, ui const uint32_t G_MASK = 0x0000FF00; const uint32_t R_B_MASK = 0x00FF00FF; - return ((color_a_amount * (color_a & G_MASK)) + (color_b_amount * (color_b & G_MASK)) >> 8) & G_MASK - | ((color_a_amount * (color_a & R_B_MASK)) + (color_b_amount * (color_b & R_B_MASK)) >> 8) & R_B_MASK; + return (((color_a_amount * (color_a & G_MASK)) + (color_b_amount * (color_b & G_MASK))) >> 8) & G_MASK + | (((color_a_amount * (color_a & R_B_MASK)) + (color_b_amount * (color_b & R_B_MASK))) >> 8) & R_B_MASK; } inline uint32_t DDSFileClass::Decode_Line_Code(uint8_t *packed)