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

Consistent naming of ImageId parameter

Browse Source
This commit is contained in:
Rik Smeets
2022-10-08 19:38:04 +02:00
parent 1d557f40ee
commit ffab787c73
2 changed files with 22 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
src/openrct2/paint/Supports.cpp
View File

@@ -451,7 +451,7 @@ static constexpr const uint16_t word_97B3C4[] = {
* @param supportType (edi) Type and direction of supports.
* @param special (ax) Used for curved supports.
* @param height (dx) The height of the supports.
* @param imageColourFlags (ebp) The colour and palette flags for the support sprites.
* @param imageTemplate (ebp) The colour and palette flags for the support sprites.
* @param[out] underground (Carry flag) true if underground.
* @returns (al) true if any supports have been drawn, otherwise false.
*/
@@ -611,7 +611,7 @@ bool WoodenASupportsPaintSetup(
* @param supportType (edi)
* @param special (ax)
* @param height (dx)
* @param imageColourFlags (ebp)
* @param imageTemplate (ebp)
* @param[out] underground (Carry Flag)
*
* @return (al) whether supports have been drawn
@@ -782,11 +782,11 @@ bool WoodenBSupportsPaintSetup(
* @param segment (ebx)
* @param special (ax)
* @param height (edx)
* @param imageColourFlags (ebp)
* @param imageTemplate (ebp)
* rct2: 0x00663105
*/
bool MetalASupportsPaintSetup(
paint_session& session, uint8_t supportType, uint8_t segment, int32_t special, int32_t height, ImageId imageColourFlags)
paint_session& session, uint8_t supportType, uint8_t segment, int32_t special, int32_t height, ImageId imageTemplate)
{
support_height* supportSegments = session.SupportSegments;
@@ -801,7 +801,7 @@ bool MetalASupportsPaintSetup(
{
return false;
}
imageColourFlags = ImageId(0).WithTransparency(FilterPaletteID::PaletteDarken1);
imageTemplate = ImageId(0).WithTransparency(FilterPaletteID::PaletteDarken1);
}
int16_t originalHeight = height;
@@ -850,7 +850,7 @@ bool MetalASupportsPaintSetup(
int16_t boundBoxLengthX = _97B062[ebp].x;
int16_t boundBoxLengthY = _97B062[ebp].y;
auto image_id = imageColourFlags.WithIndex(_metalSupportTypeToCrossbeamImages[supportType][ebp]);
auto image_id = imageTemplate.WithIndex(_metalSupportTypeToCrossbeamImages[supportType][ebp]);
PaintAddImageAsParent(session, image_id, { xOffset, yOffset, height }, { boundBoxLengthX, boundBoxLengthY, 1 });
segment = newSegment;
@@ -868,7 +868,7 @@ bool MetalASupportsPaintSetup(
uint32_t imageIndex = _97B15C[supportType].base_id;
imageIndex += metal_supports_slope_image_map[supportSegments[segment].slope & TILE_ELEMENT_SURFACE_SLOPE_MASK];
auto image_id = imageColourFlags.WithIndex(imageIndex);
auto image_id = imageTemplate.WithIndex(imageIndex);
PaintAddImageAsParent(session, image_id, { xOffset, yOffset, supportSegments[segment].height }, { 0, 0, 5 });
@@ -892,7 +892,7 @@ bool MetalASupportsPaintSetup(
uint32_t imageIndex = _97B15C[supportType].beam_id;
imageIndex += heightDiff - 1;
auto image_id = imageColourFlags.WithIndex(imageIndex);
auto image_id = imageTemplate.WithIndex(imageIndex);
PaintAddImageAsParent(session, image_id, { xOffset, yOffset, height }, { 0, 0, heightDiff - 1 });
}
@@ -924,7 +924,7 @@ bool MetalASupportsPaintSetup(
if (count == 3 && z == 0x10)
imageIndex++;
auto image_id = imageColourFlags.WithIndex(imageIndex);
auto image_id = imageTemplate.WithIndex(imageIndex);
PaintAddImageAsParent(session, image_id, { xOffset, yOffset, height }, { 0, 0, z - 1 });
height += z;
@@ -964,7 +964,7 @@ bool MetalASupportsPaintSetup(
uint32_t imageIndex = _97B190[supportType].beam_id;
imageIndex += z - 1;
auto image_id = imageColourFlags.WithIndex(imageIndex);
auto image_id = imageTemplate.WithIndex(imageIndex);
PaintAddImageAsParent(session, image_id, { xOffset, yOffset, height }, { 0, 0, 0 }, boundBoxOffset);
@@ -982,12 +982,12 @@ bool MetalASupportsPaintSetup(
* @param segment (ebx)
* @param special (ax)
* @param height (edx)
* @param imageColourFlags (ebp)
* @param imageTemplate (ebp)
*
* @return (Carry Flag)
*/
bool MetalBSupportsPaintSetup(
paint_session& session, uint8_t supportType, uint8_t segment, int32_t special, int32_t height, ImageId imageColourFlags)
paint_session& session, uint8_t supportType, uint8_t segment, int32_t special, int32_t height, ImageId imageTemplate)
{
support_height* supportSegments = session.SupportSegments;
uint8_t originalSegment = segment;
@@ -1003,7 +1003,7 @@ bool MetalBSupportsPaintSetup(
{
return false;
}
imageColourFlags = ImageId(0).WithTransparency(FilterPaletteID::PaletteDarken1);
imageTemplate = ImageId(0).WithTransparency(FilterPaletteID::PaletteDarken1);
}
uint16_t _9E3294 = 0xFFFF;
@@ -1049,7 +1049,7 @@ bool MetalBSupportsPaintSetup(
}
PaintAddImageAsParent(
session, imageColourFlags.WithIndex(_metalSupportTypeToCrossbeamImages[supportType][ebp]),
session, imageTemplate.WithIndex(_metalSupportTypeToCrossbeamImages[supportType][ebp]),
{ SupportBoundBoxes[originalSegment] + loc_97B052[ebp], baseHeight }, { _97B062[ebp], 1 });
}
@@ -1066,7 +1066,7 @@ bool MetalBSupportsPaintSetup(
uint32_t imageId = _97B15C[supportType].base_id + imageOffset;
PaintAddImageAsParent(
session, imageColourFlags.WithIndex(imageId), { SupportBoundBoxes[segment], supportSegments[segment].height },
session, imageTemplate.WithIndex(imageId), { SupportBoundBoxes[segment], supportSegments[segment].height },
{ 0, 0, 5 });
baseHeight = supportSegments[segment].height + 6;
@@ -1082,7 +1082,7 @@ bool MetalBSupportsPaintSetup(
if (heightDiff > 0)
{
PaintAddImageAsParent(
session, imageColourFlags.WithIndex(_97B15C[supportType].beam_id + (heightDiff - 1)),
session, imageTemplate.WithIndex(_97B15C[supportType].beam_id + (heightDiff - 1)),
{ SupportBoundBoxes[segment], baseHeight }, { 0, 0, heightDiff - 1 });
}
@@ -1118,7 +1118,7 @@ bool MetalBSupportsPaintSetup(
}
PaintAddImageAsParent(
session, imageColourFlags.WithIndex(imageId), { SupportBoundBoxes[segment], baseHeight }, { 0, 0, beamLength - 1 });
session, imageTemplate.WithIndex(imageId), { SupportBoundBoxes[segment], baseHeight }, { 0, 0, beamLength - 1 });
baseHeight += beamLength;
i++;
@@ -1147,7 +1147,7 @@ bool MetalBSupportsPaintSetup(
uint32_t imageId = _97B15C[supportType].beam_id + (beamLength - 1);
PaintAddImageAsParent(
session, imageColourFlags.WithIndex(imageId), { SupportBoundBoxes[originalSegment], baseHeight }, { 0, 0, 0 },
session, imageTemplate.WithIndex(imageId), { SupportBoundBoxes[originalSegment], baseHeight }, { 0, 0, 0 },
{ SupportBoundBoxes[originalSegment], height });
baseHeight += beamLength;
}
@@ -1162,7 +1162,7 @@ bool MetalBSupportsPaintSetup(
* @param supportType (edi)
* @param special (ax)
* @param height (dx)
* @param imageColourFlags (ebp)
* @param imageTemplate (ebp)
* @param railingsDescriptor (0x00F3EF6C)
* @param[out] underground (Carry Flag)
*
@@ -1318,7 +1318,7 @@ bool path_a_supports_paint_setup(
* @param segment (ebx)
* @param special (ax)
* @param height (dx)
* @param imageColourFlags (ebp)
* @param imageTemplate (ebp)
* @param railingsDescriptor (0x00F3EF6C)
*
* @return Whether supports were drawn

4
src/openrct2/paint/Supports.h
View File

@@ -22,9 +22,9 @@ bool WoodenASupportsPaintSetup(
bool WoodenBSupportsPaintSetup(
paint_session& session, int32_t supportType, int32_t special, int32_t height, ImageId imageTemplate);
bool MetalASupportsPaintSetup(
paint_session& session, uint8_t supportType, uint8_t segment, int32_t special, int32_t height, ImageId imageColourFlags);
paint_session& session, uint8_t supportType, uint8_t segment, int32_t special, int32_t height, ImageId imageTemplate);
bool MetalBSupportsPaintSetup(
paint_session& session, uint8_t supportType, uint8_t segment, int32_t special, int32_t height, ImageId imageColourFlags);
paint_session& session, uint8_t supportType, uint8_t segment, int32_t special, int32_t height, ImageId imageTemplate);
bool path_a_supports_paint_setup(
paint_session& session, int32_t supportType, int32_t special, int32_t height, ImageId imageTemplate,
const FootpathPaintInfo& pathPaintInfo, bool* underground);