mirror of https://github.com/OpenRCT2/OpenRCT2.git
Rename track_map_3x3 to kTrackMap3x3
This commit is contained in:
parent
97e9634a61
commit
a3e685bf1f
|
@ -50,13 +50,6 @@ static constexpr TileCoordsXY EntranceOffsetEdgeNW[] = {
|
|||
{ -1, 0 },
|
||||
};
|
||||
|
||||
const uint8_t track_map_3x3[][9] = {
|
||||
{ 0, 1, 2, 3, 4, 5, 6, 7, 8 },
|
||||
{ 0, 3, 5, 7, 2, 8, 1, 6, 4 },
|
||||
{ 0, 7, 8, 6, 5, 4, 3, 1, 2 },
|
||||
{ 0, 6, 4, 1, 8, 2, 7, 3, 5 },
|
||||
};
|
||||
|
||||
// clang-format off
|
||||
const uint8_t edges_3x3[] = {
|
||||
0,
|
||||
|
|
|
@ -30,7 +30,12 @@ constexpr uint8_t kEdges2x2[] = {
|
|||
EDGE_SW | EDGE_SE,
|
||||
};
|
||||
|
||||
extern const uint8_t track_map_3x3[][9];
|
||||
constexpr uint8_t kTrackMap3x3[][9] = {
|
||||
{ 0, 1, 2, 3, 4, 5, 6, 7, 8 },
|
||||
{ 0, 3, 5, 7, 2, 8, 1, 6, 4 },
|
||||
{ 0, 7, 8, 6, 5, 4, 3, 1, 2 },
|
||||
{ 0, 6, 4, 1, 8, 2, 7, 3, 5 },
|
||||
};
|
||||
extern const uint8_t edges_3x3[];
|
||||
|
||||
extern const uint8_t track_map_4x4[][16];
|
||||
|
|
|
@ -50,7 +50,7 @@ static void PaintCircus(
|
|||
PaintSession& session, const Ride& ride, uint8_t trackSequence, uint8_t direction, int32_t height,
|
||||
const TrackElement& trackElement)
|
||||
{
|
||||
trackSequence = track_map_3x3[direction][trackSequence];
|
||||
trackSequence = kTrackMap3x3[direction][trackSequence];
|
||||
|
||||
int32_t edges = edges_3x3[trackSequence];
|
||||
|
||||
|
|
|
@ -84,7 +84,7 @@ static void PaintCrookedHouse(
|
|||
PaintSession& session, const Ride& ride, uint8_t trackSequence, uint8_t direction, int32_t height,
|
||||
const TrackElement& trackElement)
|
||||
{
|
||||
trackSequence = track_map_3x3[direction][trackSequence];
|
||||
trackSequence = kTrackMap3x3[direction][trackSequence];
|
||||
|
||||
int32_t edges = edges_3x3[trackSequence];
|
||||
|
||||
|
|
|
@ -64,7 +64,7 @@ static void PaintHauntedHouse(
|
|||
PaintSession& session, const Ride& ride, uint8_t trackSequence, uint8_t direction, int32_t height,
|
||||
const TrackElement& trackElement)
|
||||
{
|
||||
trackSequence = track_map_3x3[direction][trackSequence];
|
||||
trackSequence = kTrackMap3x3[direction][trackSequence];
|
||||
|
||||
int32_t edges = edges_3x3[trackSequence];
|
||||
|
||||
|
|
|
@ -105,7 +105,7 @@ static void PaintMerryGoRound(
|
|||
PaintSession& session, const Ride& ride, uint8_t trackSequence, uint8_t direction, int32_t height,
|
||||
const TrackElement& trackElement)
|
||||
{
|
||||
trackSequence = track_map_3x3[direction][trackSequence];
|
||||
trackSequence = kTrackMap3x3[direction][trackSequence];
|
||||
|
||||
int32_t edges = edges_3x3[trackSequence];
|
||||
|
||||
|
|
|
@ -83,7 +83,7 @@ static void PaintObservationTowerBase(
|
|||
PaintSession& session, const Ride& ride, uint8_t trackSequence, uint8_t direction, int32_t height,
|
||||
const TrackElement& trackElement)
|
||||
{
|
||||
trackSequence = track_map_3x3[direction][trackSequence];
|
||||
trackSequence = kTrackMap3x3[direction][trackSequence];
|
||||
|
||||
int32_t edges = edges_3x3[trackSequence];
|
||||
CoordsXY position = session.MapPosition;
|
||||
|
|
|
@ -87,7 +87,7 @@ static void PaintSpaceRings(
|
|||
PaintSession& session, const Ride& ride, uint8_t trackSequence, uint8_t direction, int32_t height,
|
||||
const TrackElement& trackElement)
|
||||
{
|
||||
trackSequence = track_map_3x3[direction][trackSequence];
|
||||
trackSequence = kTrackMap3x3[direction][trackSequence];
|
||||
|
||||
int32_t edges = edges_3x3[trackSequence];
|
||||
CoordsXY position = session.MapPosition;
|
||||
|
|
|
@ -52,7 +52,7 @@ static void Paint3dCinema(
|
|||
PaintSession& session, const Ride& ride, uint8_t trackSequence, uint8_t direction, int32_t height,
|
||||
const TrackElement& trackElement)
|
||||
{
|
||||
trackSequence = track_map_3x3[direction][trackSequence];
|
||||
trackSequence = kTrackMap3x3[direction][trackSequence];
|
||||
|
||||
int32_t edges = edges_3x3[trackSequence];
|
||||
|
||||
|
|
|
@ -91,7 +91,7 @@ static void PaintLaunchedFreefallBase(
|
|||
PaintSession& session, const Ride& ride, uint8_t trackSequence, uint8_t direction, int32_t height,
|
||||
const TrackElement& trackElement)
|
||||
{
|
||||
trackSequence = track_map_3x3[direction][trackSequence];
|
||||
trackSequence = kTrackMap3x3[direction][trackSequence];
|
||||
|
||||
int32_t edges = edges_3x3[trackSequence];
|
||||
|
||||
|
|
|
@ -103,7 +103,7 @@ static void PaintRotoDropBase(
|
|||
PaintSession& session, const Ride& ride, uint8_t trackSequence, uint8_t direction, int32_t height,
|
||||
const TrackElement& trackElement)
|
||||
{
|
||||
trackSequence = track_map_3x3[direction][trackSequence];
|
||||
trackSequence = kTrackMap3x3[direction][trackSequence];
|
||||
|
||||
int32_t edges = edges_3x3[trackSequence];
|
||||
|
||||
|
|
|
@ -182,7 +182,7 @@ static void PaintTopSpin(
|
|||
PaintSession& session, const Ride& ride, uint8_t trackSequence, uint8_t direction, int32_t height,
|
||||
const TrackElement& trackElement)
|
||||
{
|
||||
trackSequence = track_map_3x3[direction][trackSequence];
|
||||
trackSequence = kTrackMap3x3[direction][trackSequence];
|
||||
|
||||
int32_t edges = edges_3x3[trackSequence];
|
||||
|
||||
|
|
|
@ -85,7 +85,7 @@ static void PaintTwist(
|
|||
PaintSession& session, const Ride& ride, uint8_t trackSequence, uint8_t direction, int32_t height,
|
||||
const TrackElement& trackElement)
|
||||
{
|
||||
trackSequence = track_map_3x3[direction][trackSequence];
|
||||
trackSequence = kTrackMap3x3[direction][trackSequence];
|
||||
|
||||
const uint8_t edges = edges_3x3[trackSequence];
|
||||
|
||||
|
|
|
@ -50,7 +50,7 @@ static void PaintLiftBase(
|
|||
PaintSession& session, const Ride& ride, uint8_t trackSequence, uint8_t direction, int32_t height,
|
||||
const TrackElement& trackElement)
|
||||
{
|
||||
trackSequence = track_map_3x3[direction][trackSequence];
|
||||
trackSequence = kTrackMap3x3[direction][trackSequence];
|
||||
|
||||
if (trackSequence == 0)
|
||||
{
|
||||
|
|
Loading…
Reference in New Issue