mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2025-12-23 15:52:55 +01:00
Code Issues Releases Wiki Activity

Rename si to crossbeamHeight in metal support paint functions

Browse Source
This commit is contained in:
mix
2025-07-09 01:13:17 +01:00
parent 199d9893c9
commit 72d7fbd81b
1 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/openrct2/paint/support/MetalSupports.cpp
View File

@@ -365,7 +365,7 @@ static bool MetalASupportsPaintSetup(
segment = newSegment; segment = newSegment;
} }
int16_t si = currentHeight; const int16_t crossbeamHeight = currentHeight;
if (supportSegments[segment].slope & kTileSlopeAboveTrackOrScenery || currentHeight - supportSegments[segment].height < 6 if (supportSegments[segment].slope & kTileSlopeAboveTrackOrScenery || currentHeight - supportSegments[segment].height < 6
|| kSupportBasesAndBeams[supportType].base == kImageIndexUndefined) || kSupportBasesAndBeams[supportType].base == kImageIndexUndefined)
{ {
@@ -388,9 +388,9 @@ static bool MetalASupportsPaintSetup(
// Work out if a small support segment required to bring support to normal // Work out if a small support segment required to bring support to normal
// size (aka floor2(x, 16)) // size (aka floor2(x, 16))
int16_t heightDiff = floor2(currentHeight + 16, 16); int16_t heightDiff = floor2(currentHeight + 16, 16);
if (heightDiff > si) if (heightDiff > crossbeamHeight)
{ {
heightDiff = si; heightDiff = crossbeamHeight;
} }
heightDiff -= currentHeight; heightDiff -= currentHeight;
@@ -416,9 +416,9 @@ static bool MetalASupportsPaintSetup(
count = 0; count = 0;
int16_t beamLength = currentHeight + 16; int16_t beamLength = currentHeight + 16;
if (beamLength > si) if (beamLength > crossbeamHeight)
{ {
beamLength = si; beamLength = crossbeamHeight;
} }
beamLength -= currentHeight; beamLength -= currentHeight;
@@ -561,7 +561,7 @@ static bool MetalBSupportsPaintSetup(
{ kMetalSupportCrossBeamBoundBoxLengths[ebp], 1 }); { kMetalSupportCrossBeamBoundBoxLengths[ebp], 1 });
} }
int32_t si = currentHeight; const int32_t crossbeamHeight = currentHeight;
if ((supportSegments[segment].slope & kTileSlopeAboveTrackOrScenery) if ((supportSegments[segment].slope & kTileSlopeAboveTrackOrScenery)
|| (currentHeight - supportSegments[segment].height < 6) || (currentHeight - supportSegments[segment].height < 6)
@@ -582,9 +582,9 @@ static bool MetalBSupportsPaintSetup(
} }
int16_t heightDiff = floor2(currentHeight + 16, 16); int16_t heightDiff = floor2(currentHeight + 16, 16);
if (heightDiff > si) if (heightDiff > crossbeamHeight)
{ {
heightDiff = si; heightDiff = crossbeamHeight;
} }
heightDiff -= currentHeight; heightDiff -= currentHeight;
@@ -603,9 +603,9 @@ static bool MetalBSupportsPaintSetup(
while (true) while (true)
{ {
endHeight = currentHeight + 16; endHeight = currentHeight + 16;
if (endHeight > si) if (endHeight > crossbeamHeight)
{ {
endHeight = si; endHeight = crossbeamHeight;
} }
int16_t beamLength = endHeight - currentHeight; int16_t beamLength = endHeight - currentHeight;