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

Use constexpr where applicable in Monorail.cpp

This commit is contained in:
ζeh Matt 2021-08-26 22:42:50 +03:00
parent 78747d266f
commit 04ba3f92d7
No known key found for this signature in database
GPG Key ID: 18CE582C71A225B0
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -746,14 +746,14 @@ static void paint_monorail_track_s_bend_left(
trackSequence = 3 - trackSequence;
}
const CoordsXY offsetList[] = {
static constexpr CoordsXY offsetList[] = {
{ 0, 6 },
{ 0, 0 },
{ 0, 6 },
{ 0, 6 },
};
const CoordsXY boundsList[] = {
static constexpr CoordsXY boundsList[] = {
{ 32, 20 },
{ 32, 26 },
{ 32, 26 },
@ -850,14 +850,14 @@ static void paint_monorail_track_s_bend_right(
trackSequence = 3 - trackSequence;
}
const CoordsXY offsetList[] = {
static constexpr CoordsXY offsetList[] = {
{ 0, 6 },
{ 0, 6 },
{ 0, 0 },
{ 0, 6 },
};
const CoordsXY boundsList[] = {
static constexpr CoordsXY boundsList[] = {
{ 32, 20 },
{ 32, 26 },
{ 32, 26 },
@ -1133,7 +1133,7 @@ static void paint_monorail_track_left_eighth_to_orthogonal(
paint_session* session, const Ride* ride, uint8_t trackSequence, uint8_t direction, int32_t height,
const TrackElement& trackElement)
{
const uint8_t map[] = { 4, 2, 3, 1, 0 };
static constexpr uint8_t map[] = { 4, 2, 3, 1, 0 };
trackSequence = map[trackSequence];
paint_monorail_track_right_eighth_to_diag(session, ride, trackSequence, (direction + 2) % 4, height, trackElement);
}
@ -1143,7 +1143,7 @@ static void paint_monorail_track_right_eighth_to_orthogonal(
paint_session* session, const Ride* ride, uint8_t trackSequence, uint8_t direction, int32_t height,
const TrackElement& trackElement)
{
const uint8_t map[] = { 4, 2, 3, 1, 0 };
static constexpr uint8_t map[] = { 4, 2, 3, 1, 0 };
trackSequence = map[trackSequence];
paint_monorail_track_left_eighth_to_diag(session, ride, trackSequence, (direction + 3) % 4, height, trackElement);
}