mirror of https://github.com/OpenRCT2/OpenRCT2.git
Rename defaultRightQuarterTurn5TilesOffsets
This commit is contained in:
parent
39b6f22302
commit
48e53cdd23
|
@ -1187,37 +1187,6 @@ void TrackPaintUtilDiagTilesPaint(
|
||||||
{ { boundsOffset.x, boundsOffset.y, height + boundsOffset.z }, { boundsLength, thickness } });
|
{ { boundsOffset.x, boundsOffset.y, height + boundsOffset.z }, { boundsLength, thickness } });
|
||||||
}
|
}
|
||||||
|
|
||||||
constexpr CoordsXY defaultRightQuarterTurn5TilesOffsets[4][5] = {
|
|
||||||
{
|
|
||||||
{ 0, 6 },
|
|
||||||
{ 0, 16 },
|
|
||||||
{ 0, 0 },
|
|
||||||
{ 16, 0 },
|
|
||||||
{ 6, 0 },
|
|
||||||
},
|
|
||||||
{
|
|
||||||
{ 6, 0 },
|
|
||||||
{ 16, 0 },
|
|
||||||
{ 0, 16 },
|
|
||||||
{ 0, 0 },
|
|
||||||
{ 0, 6 },
|
|
||||||
},
|
|
||||||
{
|
|
||||||
{ 0, 6 },
|
|
||||||
{ 0, 0 },
|
|
||||||
{ 16, 16 },
|
|
||||||
{ 0, 0 },
|
|
||||||
{ 6, 0 },
|
|
||||||
},
|
|
||||||
{
|
|
||||||
{ 6, 0 },
|
|
||||||
{ 0, 0 },
|
|
||||||
{ 16, 0 },
|
|
||||||
{ 0, 16 },
|
|
||||||
{ 0, 6 },
|
|
||||||
},
|
|
||||||
};
|
|
||||||
|
|
||||||
constexpr CoordsXYZ defaultRightQuarterTurn5TilesBoundOffsets[4][5] = {
|
constexpr CoordsXYZ defaultRightQuarterTurn5TilesBoundOffsets[4][5] = {
|
||||||
{
|
{
|
||||||
{ 0, 6, 0 },
|
{ 0, 6, 0 },
|
||||||
|
|
|
@ -372,7 +372,36 @@ constexpr uint8_t kMapReversedDiagonalStraight[4] = {
|
||||||
0,
|
0,
|
||||||
};
|
};
|
||||||
|
|
||||||
extern const CoordsXY defaultRightQuarterTurn5TilesOffsets[4][5];
|
constexpr CoordsXY kDefaultRightQuarterTurn5TilesOffsets[4][5] = {
|
||||||
|
{
|
||||||
|
{ 0, 6 },
|
||||||
|
{ 0, 16 },
|
||||||
|
{ 0, 0 },
|
||||||
|
{ 16, 0 },
|
||||||
|
{ 6, 0 },
|
||||||
|
},
|
||||||
|
{
|
||||||
|
{ 6, 0 },
|
||||||
|
{ 16, 0 },
|
||||||
|
{ 0, 16 },
|
||||||
|
{ 0, 0 },
|
||||||
|
{ 0, 6 },
|
||||||
|
},
|
||||||
|
{
|
||||||
|
{ 0, 6 },
|
||||||
|
{ 0, 0 },
|
||||||
|
{ 16, 16 },
|
||||||
|
{ 0, 0 },
|
||||||
|
{ 6, 0 },
|
||||||
|
},
|
||||||
|
{
|
||||||
|
{ 6, 0 },
|
||||||
|
{ 0, 0 },
|
||||||
|
{ 16, 0 },
|
||||||
|
{ 0, 16 },
|
||||||
|
{ 0, 6 },
|
||||||
|
},
|
||||||
|
};
|
||||||
extern const CoordsXYZ defaultRightQuarterTurn5TilesBoundOffsets[4][5];
|
extern const CoordsXYZ defaultRightQuarterTurn5TilesBoundOffsets[4][5];
|
||||||
extern const CoordsXY defaultRightQuarterTurn5TilesBoundLengths[4][5];
|
extern const CoordsXY defaultRightQuarterTurn5TilesBoundLengths[4][5];
|
||||||
|
|
||||||
|
|
|
@ -2054,7 +2054,7 @@ static void JuniorRCRightQuarterTurn5TilesPaintSetup(
|
||||||
{
|
{
|
||||||
TrackPaintUtilRightQuarterTurn5TilesPaint(
|
TrackPaintUtilRightQuarterTurn5TilesPaint(
|
||||||
session, 1, height, direction, trackSequence, session.TrackColours, junior_rc_track_pieces_flat_quarter_turn_5_tiles,
|
session, 1, height, direction, trackSequence, session.TrackColours, junior_rc_track_pieces_flat_quarter_turn_5_tiles,
|
||||||
defaultRightQuarterTurn5TilesOffsets, defaultRightQuarterTurn5TilesBoundLengths,
|
kDefaultRightQuarterTurn5TilesOffsets, defaultRightQuarterTurn5TilesBoundLengths,
|
||||||
defaultRightQuarterTurn5TilesBoundOffsets);
|
defaultRightQuarterTurn5TilesBoundOffsets);
|
||||||
|
|
||||||
int32_t supportHeight = height + junior_rc_track_right_quarter_turn_5_tiles_support_height_offset[direction][trackSequence];
|
int32_t supportHeight = height + junior_rc_track_right_quarter_turn_5_tiles_support_height_offset[direction][trackSequence];
|
||||||
|
@ -2932,7 +2932,7 @@ static void JuniorRCPaintTrackRightQuarterTurn5Tiles25DegUp(
|
||||||
auto subTypeOffset = JuniorRCGetSubTypeOffset<JuniorRCSubType::Junior>(trackElement);
|
auto subTypeOffset = JuniorRCGetSubTypeOffset<JuniorRCSubType::Junior>(trackElement);
|
||||||
TrackPaintUtilRightQuarterTurn5TilesPaint(
|
TrackPaintUtilRightQuarterTurn5TilesPaint(
|
||||||
session, 1, height, direction, trackSequence, session.TrackColours,
|
session, 1, height, direction, trackSequence, session.TrackColours,
|
||||||
junior_rc_track_pieces_right_quarter_turn_5_tiles_25_deg_up[subTypeOffset], defaultRightQuarterTurn5TilesOffsets,
|
junior_rc_track_pieces_right_quarter_turn_5_tiles_25_deg_up[subTypeOffset], kDefaultRightQuarterTurn5TilesOffsets,
|
||||||
defaultRightQuarterTurn5TilesBoundLengths, nullptr);
|
defaultRightQuarterTurn5TilesBoundLengths, nullptr);
|
||||||
|
|
||||||
static constexpr uint8_t supportSpecial[4] = { 11, 8, 8, 7 };
|
static constexpr uint8_t supportSpecial[4] = { 11, 8, 8, 7 };
|
||||||
|
|
|
@ -644,7 +644,7 @@ static void PaintMonorailTrackRightQuarterTurn5Tiles(
|
||||||
{
|
{
|
||||||
TrackPaintUtilRightQuarterTurn5TilesPaint(
|
TrackPaintUtilRightQuarterTurn5TilesPaint(
|
||||||
session, 3, height, direction, trackSequence, session.TrackColours, monorail_track_pieces_flat_quarter_turn_5_tiles,
|
session, 3, height, direction, trackSequence, session.TrackColours, monorail_track_pieces_flat_quarter_turn_5_tiles,
|
||||||
defaultRightQuarterTurn5TilesOffsets, defaultRightQuarterTurn5TilesBoundLengths, nullptr);
|
kDefaultRightQuarterTurn5TilesOffsets, defaultRightQuarterTurn5TilesBoundLengths, nullptr);
|
||||||
|
|
||||||
switch (trackSequence)
|
switch (trackSequence)
|
||||||
{
|
{
|
||||||
|
|
Loading…
Reference in New Issue