mirror of https://github.com/OpenRCT2/OpenRCT2.git
Rename to secondaryRemapPalette, tertiaryRemapPalette
This commit is contained in:
parent
dcc1a0627d
commit
25faa361ad
|
@ -36,7 +36,7 @@ using namespace OpenRCT2::Ui;
|
||||||
* rct2: 0x0009ABE0C
|
* rct2: 0x0009ABE0C
|
||||||
*/
|
*/
|
||||||
// clang-format off
|
// clang-format off
|
||||||
static thread_local uint8_t gPeepPalette[256] = {
|
static thread_local uint8_t secondaryRemapPalette[256] = {
|
||||||
0x00, 0xF3, 0xF4, 0xF5, 0x04, 0x05, 0x06, 0x07, 0x08, 0x09, 0x0A, 0x0B, 0x0C, 0x0D, 0x0E, 0x0F,
|
0x00, 0xF3, 0xF4, 0xF5, 0x04, 0x05, 0x06, 0x07, 0x08, 0x09, 0x0A, 0x0B, 0x0C, 0x0D, 0x0E, 0x0F,
|
||||||
0x10, 0x11, 0x12, 0x13, 0x14, 0x15, 0x16, 0x17, 0x18, 0x19, 0x1A, 0x1B, 0x1C, 0x1D, 0x1E, 0x1F,
|
0x10, 0x11, 0x12, 0x13, 0x14, 0x15, 0x16, 0x17, 0x18, 0x19, 0x1A, 0x1B, 0x1C, 0x1D, 0x1E, 0x1F,
|
||||||
0x20, 0x21, 0x22, 0x23, 0x24, 0x25, 0x26, 0x27, 0x28, 0x29, 0x2A, 0x2B, 0x2C, 0x2D, 0x2E, 0x2F,
|
0x20, 0x21, 0x22, 0x23, 0x24, 0x25, 0x26, 0x27, 0x28, 0x29, 0x2A, 0x2B, 0x2C, 0x2D, 0x2E, 0x2F,
|
||||||
|
@ -56,7 +56,7 @@ static thread_local uint8_t gPeepPalette[256] = {
|
||||||
};
|
};
|
||||||
|
|
||||||
/** rct2: 0x009ABF0C */
|
/** rct2: 0x009ABF0C */
|
||||||
static thread_local uint8_t gOtherPalette[256] = {
|
static thread_local uint8_t tertiaryRemapPalette[256] = {
|
||||||
0x00, 0xF3, 0xF4, 0xF5, 0x04, 0x05, 0x06, 0x07, 0x08, 0x09, 0x0A, 0x0B, 0x0C, 0x0D, 0x0E, 0x0F,
|
0x00, 0xF3, 0xF4, 0xF5, 0x04, 0x05, 0x06, 0x07, 0x08, 0x09, 0x0A, 0x0B, 0x0C, 0x0D, 0x0E, 0x0F,
|
||||||
0x10, 0x11, 0x12, 0x13, 0x14, 0x15, 0x16, 0x17, 0x18, 0x19, 0x1A, 0x1B, 0x1C, 0x1D, 0x1E, 0x1F,
|
0x10, 0x11, 0x12, 0x13, 0x14, 0x15, 0x16, 0x17, 0x18, 0x19, 0x1A, 0x1B, 0x1C, 0x1D, 0x1E, 0x1F,
|
||||||
0x20, 0x21, 0x22, 0x23, 0x24, 0x25, 0x26, 0x27, 0x28, 0x29, 0x2A, 0x2B, 0x2C, 0x2D, 0x2E, 0x2F,
|
0x20, 0x21, 0x22, 0x23, 0x24, 0x25, 0x26, 0x27, 0x28, 0x29, 0x2A, 0x2B, 0x2C, 0x2D, 0x2E, 0x2F,
|
||||||
|
@ -459,10 +459,10 @@ static std::optional<PaletteMap> FASTCALL GfxDrawSpriteGetPalette(ImageId imageI
|
||||||
return GetPaletteMapForColour(paletteId);
|
return GetPaletteMapForColour(paletteId);
|
||||||
}
|
}
|
||||||
|
|
||||||
auto paletteMap = PaletteMap(gPeepPalette);
|
auto paletteMap = PaletteMap(secondaryRemapPalette);
|
||||||
if (imageId.HasTertiary())
|
if (imageId.HasTertiary())
|
||||||
{
|
{
|
||||||
paletteMap = PaletteMap(gOtherPalette);
|
paletteMap = PaletteMap(tertiaryRemapPalette);
|
||||||
auto tertiaryPaletteMap = GetPaletteMapForColour(imageId.GetTertiary());
|
auto tertiaryPaletteMap = GetPaletteMapForColour(imageId.GetTertiary());
|
||||||
if (tertiaryPaletteMap.has_value())
|
if (tertiaryPaletteMap.has_value())
|
||||||
{
|
{
|
||||||
|
|
Loading…
Reference in New Issue