From 04ba3f92d7a53d5aa466fae5fbe434ec6f87e5df Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=CE=B6eh=20Matt?= <5415177+ZehMatt@users.noreply.github.com> Date: Thu, 26 Aug 2021 22:42:50 +0300 Subject: [PATCH] Use constexpr where applicable in Monorail.cpp --- src/openrct2/ride/transport/Monorail.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/openrct2/ride/transport/Monorail.cpp b/src/openrct2/ride/transport/Monorail.cpp index 65a534cc6a..ab6c1e9d4f 100644 --- a/src/openrct2/ride/transport/Monorail.cpp +++ b/src/openrct2/ride/transport/Monorail.cpp @@ -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); }