From 337602e4a78a67f828d9c524138a1cb79b2c91dc Mon Sep 17 00:00:00 2001 From: Trevor Finney <8711258+finneyt@users.noreply.github.com> Date: Wed, 22 Feb 2023 07:42:28 -0500 Subject: [PATCH] Progress on displaying new colors in software renderer --- src/openrct2-ui/windows/Dropdown.cpp | 2 -- src/openrct2/drawing/Drawing.Sprite.cpp | 4 ---- 2 files changed, 6 deletions(-) diff --git a/src/openrct2-ui/windows/Dropdown.cpp b/src/openrct2-ui/windows/Dropdown.cpp index c3896aad64..1ec8ce0604 100644 --- a/src/openrct2-ui/windows/Dropdown.cpp +++ b/src/openrct2-ui/windows/Dropdown.cpp @@ -458,8 +458,6 @@ void WindowDropdownShowColour(WindowBase* w, Widget* widget, uint8_t dropdownCol if (selectedColour == orderedColour) defaultIndex = orderedColour; - // Get palette offset for G2 colours - // Use special graphic for Invisible colour auto imageId = (orderedColour == COLOUR_OFFSET_INVISIBLE) ? ImageId(SPR_G2_ICON_PALETTE_INVISIBLE - 1, COLOUR_WHITE) : ImageId(SPR_PALETTE_BTN, orderedColour); diff --git a/src/openrct2/drawing/Drawing.Sprite.cpp b/src/openrct2/drawing/Drawing.Sprite.cpp index d60fe22e17..f8927e2e1c 100644 --- a/src/openrct2/drawing/Drawing.Sprite.cpp +++ b/src/openrct2/drawing/Drawing.Sprite.cpp @@ -408,10 +408,6 @@ static std::optional FASTCALL GfxDrawSpriteGetPalette(ImageId imageI if (!imageId.HasSecondary()) { uint8_t paletteId = imageId.GetRemap(); - if (!imageId.IsBlended()) - { - paletteId &= 0x7F; - } return GetPaletteMapForColour(paletteId); }