mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-01-16 11:33:03 +01:00
Code Issues Releases Wiki Activity

Remove remaining usages of SPRITE_ID_PALETTE_COLOUR_1()

Browse Source
This commit is contained in:
Gymnasiast
2022-10-11 14:54:27 +02:00
parent 418c5a6708
commit de71ed19b5
2 changed files with 4 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/openrct2-ui/windows/Guest.cpp
View File

@@ -1652,7 +1652,7 @@ private:
{
case ShopItem::Balloon:
ft.Rewind();
ft.Add<uint32_t>(SPRITE_ID_PALETTE_COLOUR_1(guest.BalloonColour) | GetShopItemDescriptor(item).Image);
ft.Add<uint32_t>(ImageId(GetShopItemDescriptor(item).Image, (guest.BalloonColour)).ToUInt32());
break;
case ShopItem::Photo:
invRide = get_ride(guest.Photo1RideRef);
@@ -1666,7 +1666,7 @@ private:
break;
case ShopItem::Umbrella:
ft.Rewind();
ft.Add<uint32_t>(SPRITE_ID_PALETTE_COLOUR_1(guest.UmbrellaColour) | GetShopItemDescriptor(item).Image);
ft.Add<uint32_t>(ImageId(GetShopItemDescriptor(item).Image, (guest.UmbrellaColour)).ToUInt32());
break;
case ShopItem::Voucher:
switch (guest.VoucherType)
@@ -1705,11 +1705,11 @@ private:
break;
case ShopItem::Hat:
ft.Rewind();
ft.Add<uint32_t>(SPRITE_ID_PALETTE_COLOUR_1(guest.HatColour) | GetShopItemDescriptor(item).Image);
ft.Add<uint32_t>(ImageId(GetShopItemDescriptor(item).Image, (guest.HatColour)).ToUInt32());
break;
case ShopItem::TShirt:
ft.Rewind();
ft.Add<uint32_t>(SPRITE_ID_PALETTE_COLOUR_1(guest.TshirtColour) | GetShopItemDescriptor(item).Image);
ft.Add<uint32_t>(ImageId(GetShopItemDescriptor(item).Image, (guest.TshirtColour)).ToUInt32());
break;
case ShopItem::Photo2:
invRide = get_ride(guest.Photo2RideRef);

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

@@ -461,8 +461,6 @@ void FASTCALL BlitPixels(const uint8_t* src, uint8_t* dst, const PaletteMap& pal
}
}
#define SPRITE_ID_PALETTE_COLOUR_1(colourId) (IMAGE_TYPE_REMAP | ((colourId) << 19))
#define PALETTE_TO_G1_OFFSET_COUNT 144
#define INSET_RECT_F_30 (INSET_RECT_FLAG_BORDER_INSET | INSET_RECT_FLAG_FILL_NONE)