mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-01-19 04:53:12 +01:00
Code Issues Releases Wiki Activity

Use special sprite for Invisible color

Browse Source
This commit is contained in:
Trevor Finney
2023-02-20 12:32:47 -05:00
parent 77542118c4
commit 025f467ed2
6 changed files with 12 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
resources/g2/icons/colour_invisible.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 153 B

3
resources/g2/sprites.json
View File

@@ -20588,6 +20588,9 @@
"x_offset": -5,
"y_offset": -20,
"palette": "keep"
},
{
"path": "icons/colour_invisible.png"
},
{
"path": "palette_map/palette_map_dark_olive_dark.png"

6
src/openrct2-ui/windows/Dropdown.cpp
View File

@@ -467,8 +467,12 @@ void WindowDropdownShowColour(WindowBase* w, Widget* widget, uint8_t dropdownCol
if (selectedColour == COLOUR_UI_ORDER[i])
defaultIndex = selectedColour;
// Use special graphic for Invisible color
auto imageId = (i == COLOUR_INVISIBLE) ? ImageId(SPR_G2_ICON_PALETTE_INVISIBLE, COLOUR_BORDEAUX_RED)
: ImageId(SPR_PALETTE_BTN, COLOUR_UI_ORDER[i]);
gDropdownItems[i].Format = Dropdown::FormatColourPicker;
gDropdownItems[i].Args = (i << 32) | ImageId(SPR_PALETTE_BTN, COLOUR_UI_ORDER[i]).ToUInt32();
gDropdownItems[i].Args = (i << 32) | imageId.ToUInt32();
}
// Show dropdown

2
src/openrct2/drawing/Drawing.cpp
View File

@@ -296,7 +296,7 @@ enum
// Start of G2 Palettes
SPR_PALETTE_DARK_OLIVE_DARK = 32607,
SPR_PALETTE_DARK_OLIVE_DARK = SPR_G2_PAL_REMAP_DARK_OLIVE_DARK,
SPR_PALETTE_DARK_OLIVE_LIGHT,
SPR_PALETTE_SATURATED_BROWN_LIGHT,
SPR_PALETTE_BORDEAUX_RED_DARK,

2
src/openrct2/interface/Colour.cpp
View File

@@ -59,7 +59,7 @@ void ColoursInitMaps()
// G2 Palette Init
for (int32_t i = COLOUR_NUM_ORIGINAL; i < COLOUR_COUNT; i++)
{
const G1Element* g1 = GfxGetG1Element(SPR_G2_PALETTE_BEGIN + i - COLOUR_NUM_ORIGINAL);
const G1Element* g1 = GfxGetG1Element(SPR_G2_PALETTE_BEGIN + i - (COLOUR_NUM_ORIGINAL - 1));
if (g1 != nullptr)
{
ColourMapA[i].colour_0 = g1->offset[INDEX_COLOUR_0];

3
src/openrct2/sprites.h
View File

@@ -1364,7 +1364,8 @@ enum
SPR_G2_ALPINE_LIFT_TRACK_GENTLE_DIAGONAL = SPR_G2_ALPINE_LIFT_TRACK_FLAT_DIAGONAL + 4,
SPR_G2_ALPINE_END = SPR_G2_ALPINE_LIFT_TRACK_GENTLE_DIAGONAL + 12,
SPR_G2_PALETTE_BEGIN = SPR_G2_ALPINE_END,
SPR_G2_ICON_PALETTE_INVISIBLE,
SPR_G2_PALETTE_BEGIN = SPR_G2_ICON_PALETTE_INVISIBLE,
SPR_G2_PAL_REMAP_DARK_OLIVE_DARK,
SPR_G2_PAL_REMAP_DARK_OLIVE_LIGHT,
SPR_G2_PAL_REMAP_SATURATED_BROWN_LIGHT,