mirrors
/
OpenRCT2
mirror of https://github.com/OpenRCT2/OpenRCT2.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Rename defaultRightQuarterTurn5TilesBoundLengths

This commit is contained in:
Harry-Hopkinson 2024-05-09 14:26:05 +00:00 committed by Harry Hopkinson
parent c76a122639
commit 208b9b132d
5 changed files with 35 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
src/openrct2/ride/TrackPaint.cpp
View File

@ -1187,37 +1187,6 @@ void TrackPaintUtilDiagTilesPaint(
{ { boundsOffset.x, boundsOffset.y, height + boundsOffset.z }, { boundsLength, thickness } });
}
constexpr CoordsXY defaultRightQuarterTurn5TilesBoundLengths[4][5] = {
{
{ 32, 20 },
{ 32, 16 },
{ 16, 16 },
{ 16, 32 },
{ 20, 32 },
},
{
{ 20, 32 },
{ 16, 32 },
{ 16, 16 },
{ 32, 16 },
{ 32, 20 },
},
{
{ 32, 20 },
{ 32, 16 },
{ 16, 16 },
{ 16, 32 },
{ 20, 32 },
},
{
{ 20, 32 },
{ 16, 32 },
{ 16, 16 },
{ 32, 16 },
{ 32, 20 },
},
};
static constexpr int8_t right_quarter_turn_5_tiles_sprite_map[] = {
0, -1, 1, 2, -1, 3, 4,
};

31
src/openrct2/ride/TrackPaint.h
View File

@ -432,7 +432,36 @@ constexpr CoordsXYZ kDefaultRightQuarterTurn5TilesBoundOffsets[4][5] = {
{ 0, 6, 0 },
},
};
extern const CoordsXY defaultRightQuarterTurn5TilesBoundLengths[4][5];
constexpr CoordsXY kDefaultRightQuarterTurn5TilesBoundLengths[4][5] = {
{
{ 32, 20 },
{ 32, 16 },
{ 16, 16 },
{ 16, 32 },
{ 20, 32 },
},
{
{ 20, 32 },
{ 16, 32 },
{ 16, 16 },
{ 32, 16 },
{ 32, 20 },
},
{
{ 32, 20 },
{ 32, 16 },
{ 16, 16 },
{ 16, 32 },
{ 20, 32 },
},
{
{ 20, 32 },
{ 16, 32 },
{ 16, 16 },
{ 32, 16 },
{ 32, 20 },
},
};
extern const uint8_t mapLeftQuarterTurn3TilesToRightQuarterTurn3Tiles[];
extern const CoordsXY defaultRightQuarterTurn3TilesOffsets[4][3];

6
src/openrct2/ride/coaster/JuniorRollerCoaster.cpp
View File

@ -2054,7 +2054,7 @@ static void JuniorRCRightQuarterTurn5TilesPaintSetup(
{
TrackPaintUtilRightQuarterTurn5TilesPaint(
session, 1, height, direction, trackSequence, session.TrackColours, junior_rc_track_pieces_flat_quarter_turn_5_tiles,
kDefaultRightQuarterTurn5TilesOffsets, defaultRightQuarterTurn5TilesBoundLengths,
kDefaultRightQuarterTurn5TilesOffsets, kDefaultRightQuarterTurn5TilesBoundLengths,
kDefaultRightQuarterTurn5TilesBoundOffsets);
int32_t supportHeight = height + junior_rc_track_right_quarter_turn_5_tiles_support_height_offset[direction][trackSequence];
@ -2828,7 +2828,7 @@ static void JuniorRCPaintTrackLeftQuarterTurn5Tiles25DegUp(
TrackPaintUtilRightQuarterTurn5TilesPaint(
session, 1, height, direction, trackSequence, session.TrackColours,
junior_rc_track_pieces_left_quarter_turn_5_tiles_25_deg_up[subTypeOffset],
junior_rc_left_quarter_turn_5_tiles_25_deg_up_offsets, defaultRightQuarterTurn5TilesBoundLengths, nullptr);
junior_rc_left_quarter_turn_5_tiles_25_deg_up_offsets, kDefaultRightQuarterTurn5TilesBoundLengths, nullptr);
static constexpr uint8_t supportSpecial[4] = { 8, 8, 8, 3 };
switch (trackSequence)
@ -2933,7 +2933,7 @@ static void JuniorRCPaintTrackRightQuarterTurn5Tiles25DegUp(
TrackPaintUtilRightQuarterTurn5TilesPaint(
session, 1, height, direction, trackSequence, session.TrackColours,
junior_rc_track_pieces_right_quarter_turn_5_tiles_25_deg_up[subTypeOffset], kDefaultRightQuarterTurn5TilesOffsets,
defaultRightQuarterTurn5TilesBoundLengths, nullptr);
kDefaultRightQuarterTurn5TilesBoundLengths, nullptr);
static constexpr uint8_t supportSpecial[4] = { 11, 8, 8, 7 };
switch (trackSequence)

2
src/openrct2/ride/gentle/MonorailCycles.cpp
View File

@ -310,7 +310,7 @@ static void PaintMonorailCyclesTrackRightQuarterTurn5Tiles(
{
TrackPaintUtilRightQuarterTurn5TilesPaint(
session, 1, height, direction, trackSequence, session.TrackColours, MonorailCyclesTrackPiecesFlatQuarterTurn5Tiles,
nullptr, defaultRightQuarterTurn5TilesBoundLengths, kDefaultRightQuarterTurn5TilesBoundOffsets);
nullptr, kDefaultRightQuarterTurn5TilesBoundLengths, kDefaultRightQuarterTurn5TilesBoundOffsets);
int32_t supportHeight = height + MonorailCyclesTrackRightQuarterTurn5TilesSupportHeightOffset[direction][trackSequence];
int32_t supportSpecial = MonorailCyclesTrackRightQuarterTurn5TilesSupportSpecial[direction][trackSequence];

2
src/openrct2/ride/transport/Monorail.cpp
View File

@ -644,7 +644,7 @@ static void PaintMonorailTrackRightQuarterTurn5Tiles(
{
TrackPaintUtilRightQuarterTurn5TilesPaint(
session, 3, height, direction, trackSequence, session.TrackColours, monorail_track_pieces_flat_quarter_turn_5_tiles,
kDefaultRightQuarterTurn5TilesOffsets, defaultRightQuarterTurn5TilesBoundLengths, nullptr);
kDefaultRightQuarterTurn5TilesOffsets, kDefaultRightQuarterTurn5TilesBoundLengths, nullptr);
switch (trackSequence)
{