1
0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2025-12-23 15:52:55 +01:00

Unify metal support type a and b function start setup

This commit is contained in:
mix
2025-07-09 01:32:56 +01:00
parent 1455f7bf5e
commit c3cd9da819

View File

@@ -318,13 +318,13 @@ static bool MetalASupportsPaintSetup(
imageTemplate = ImageId(0).WithTransparency(FilterPaletteID::PaletteDarken1);
}
uint8_t segment = EnumValue(placement);
auto supportType = EnumValue(supportTypeMember);
SupportHeight* supportSegments = session.SupportSegments;
int32_t currentHeight = height;
const auto originalSegment = segment;
const uint32_t supportType = EnumValue(supportTypeMember);
const uint8_t originalSegment = EnumValue(placement);
uint8_t segment = originalSegment;
uint16_t segmentHeight = 0xFFFF;
SupportHeight* const supportSegments = session.SupportSegments;
if (currentHeight < supportSegments[segment].height)
{
segmentHeight = currentHeight;
@@ -476,7 +476,7 @@ static bool MetalBSupportsPaintSetup(
{
if (!(session.Flags & PaintSessionFlags::PassedSurface))
{
return false; // AND
return false;
}
if (session.ViewFlags & VIEWPORT_FLAG_HIDE_SUPPORTS)
@@ -488,12 +488,13 @@ static bool MetalBSupportsPaintSetup(
imageTemplate = ImageId(0).WithTransparency(FilterPaletteID::PaletteDarken1);
}
const uint8_t segment = EnumValue(placement);
auto supportType = EnumValue(supportTypeMember);
SupportHeight* supportSegments = session.SupportSegments;
uint16_t segmentHeight = 0xFFFF;
int32_t currentHeight = height;
const uint32_t supportType = EnumValue(supportTypeMember);
const uint8_t originalSegment = EnumValue(placement);
uint8_t segment = originalSegment;
uint16_t segmentHeight = 0xFFFF;
SupportHeight* const supportSegments = session.SupportSegments;
if (height < supportSegments[segment].height)
{
segmentHeight = height;