diff --git a/src/openrct2/ride/TrackPaint.cpp b/src/openrct2/ride/TrackPaint.cpp index 62f588cfa0..9e74ea0ddf 100644 --- a/src/openrct2/ride/TrackPaint.cpp +++ b/src/openrct2/ride/TrackPaint.cpp @@ -51,13 +51,6 @@ static constexpr TileCoordsXY EntranceOffsetEdgeNW[] = { { -1, 0 }, }; -const uint32_t fenceSpritesRope[] = { - SPR_FENCE_ROPE_NE, - SPR_FENCE_ROPE_SE, - SPR_FENCE_ROPE_SW, - SPR_FENCE_ROPE_NW, -}; - const uint32_t fenceSpritesMetal[] = { SPR_FENCE_METAL_NE, SPR_FENCE_METAL_SE, diff --git a/src/openrct2/ride/TrackPaint.h b/src/openrct2/ride/TrackPaint.h index b79c8b7076..f51ba6c8ea 100644 --- a/src/openrct2/ride/TrackPaint.h +++ b/src/openrct2/ride/TrackPaint.h @@ -314,7 +314,12 @@ constexpr uint32_t kFloorSpritesMetalB[] = { SPR_FLOOR_METAL_B, }; -extern const uint32_t fenceSpritesRope[]; +constexpr uint32_t kFenceSpritesRope[] = { + SPR_FENCE_ROPE_NE, + SPR_FENCE_ROPE_SE, + SPR_FENCE_ROPE_SW, + SPR_FENCE_ROPE_NW, +}; extern const uint32_t fenceSpritesMetal[]; extern const uint32_t fenceSpritesMetalB[]; diff --git a/src/openrct2/ride/gentle/Circus.cpp b/src/openrct2/ride/gentle/Circus.cpp index bb1a6cfe84..c2cd9ee1f4 100644 --- a/src/openrct2/ride/gentle/Circus.cpp +++ b/src/openrct2/ride/gentle/Circus.cpp @@ -65,7 +65,7 @@ static void PaintCircus( TrackPaintUtilPaintFloor(session, edges, session.TrackColours, height, kFloorSpritesCork, stationObject); TrackPaintUtilPaintFences( - session, edges, session.MapPosition, trackElement, ride, session.SupportColours, height, fenceSpritesRope, + session, edges, session.MapPosition, trackElement, ride, session.SupportColours, height, kFenceSpritesRope, session.CurrentRotation); auto stationColour = GetStationColourScheme(session, trackElement); diff --git a/src/openrct2/ride/gentle/CrookedHouse.cpp b/src/openrct2/ride/gentle/CrookedHouse.cpp index d99adb1f7a..2a4b21c90e 100644 --- a/src/openrct2/ride/gentle/CrookedHouse.cpp +++ b/src/openrct2/ride/gentle/CrookedHouse.cpp @@ -99,7 +99,7 @@ static void PaintCrookedHouse( TrackPaintUtilPaintFences( session, edges, session.MapPosition, trackElement, ride, GetStationColourScheme(session, trackElement), height, - fenceSpritesRope, session.CurrentRotation); + kFenceSpritesRope, session.CurrentRotation); auto stationColour = GetStationColourScheme(session, trackElement); switch (trackSequence) diff --git a/src/openrct2/ride/gentle/HauntedHouse.cpp b/src/openrct2/ride/gentle/HauntedHouse.cpp index 9d1398a96c..8f99066eee 100644 --- a/src/openrct2/ride/gentle/HauntedHouse.cpp +++ b/src/openrct2/ride/gentle/HauntedHouse.cpp @@ -80,7 +80,7 @@ static void PaintHauntedHouse( TrackPaintUtilPaintFences( session, edges, session.MapPosition, trackElement, ride, GetStationColourScheme(session, trackElement), height, - fenceSpritesRope, session.CurrentRotation); + kFenceSpritesRope, session.CurrentRotation); auto stationColour = GetStationColourScheme(session, trackElement); switch (trackSequence) diff --git a/src/openrct2/ride/gentle/MerryGoRound.cpp b/src/openrct2/ride/gentle/MerryGoRound.cpp index c9052ceeae..88a5746bdd 100644 --- a/src/openrct2/ride/gentle/MerryGoRound.cpp +++ b/src/openrct2/ride/gentle/MerryGoRound.cpp @@ -121,7 +121,7 @@ static void PaintMerryGoRound( TrackPaintUtilPaintFences( session, edges, session.MapPosition, trackElement, ride, GetStationColourScheme(session, trackElement), height, - fenceSpritesRope, session.CurrentRotation); + kFenceSpritesRope, session.CurrentRotation); auto stationColour = GetStationColourScheme(session, trackElement); switch (trackSequence) diff --git a/src/openrct2/ride/thrill/3dCinema.cpp b/src/openrct2/ride/thrill/3dCinema.cpp index 1a69c85af3..d1f3ec28bb 100644 --- a/src/openrct2/ride/thrill/3dCinema.cpp +++ b/src/openrct2/ride/thrill/3dCinema.cpp @@ -67,7 +67,7 @@ static void Paint3dCinema( TrackPaintUtilPaintFloor(session, edges, session.TrackColours, height, kFloorSpritesCork, stationObject); TrackPaintUtilPaintFences( - session, edges, session.MapPosition, trackElement, ride, stationColour, height, fenceSpritesRope, + session, edges, session.MapPosition, trackElement, ride, stationColour, height, kFenceSpritesRope, session.CurrentRotation); switch (trackSequence) diff --git a/src/openrct2/ride/thrill/Enterprise.cpp b/src/openrct2/ride/thrill/Enterprise.cpp index b69c8e1fe5..ddf4115da5 100644 --- a/src/openrct2/ride/thrill/Enterprise.cpp +++ b/src/openrct2/ride/thrill/Enterprise.cpp @@ -105,7 +105,7 @@ static void PaintEnterprise( TrackPaintUtilPaintFloor(session, edges, session.TrackColours, height, kFloorSpritesCork, stationObject); TrackPaintUtilPaintFences( - session, edges, session.MapPosition, trackElement, ride, session.TrackColours, height, fenceSpritesRope, + session, edges, session.MapPosition, trackElement, ride, session.TrackColours, height, kFenceSpritesRope, session.CurrentRotation); switch (trackSequence) diff --git a/src/openrct2/ride/thrill/MotionSimulator.cpp b/src/openrct2/ride/thrill/MotionSimulator.cpp index 801b8bd76c..7ed3c110ef 100644 --- a/src/openrct2/ride/thrill/MotionSimulator.cpp +++ b/src/openrct2/ride/thrill/MotionSimulator.cpp @@ -119,7 +119,7 @@ static void PaintMotionSimulator( TrackPaintUtilPaintFloor(session, edges, session.TrackColours, height, kFloorSpritesCork, stationObject); TrackPaintUtilPaintFences( - session, edges, session.MapPosition, trackElement, ride, session.SupportColours, height, fenceSpritesRope, + session, edges, session.MapPosition, trackElement, ride, session.SupportColours, height, kFenceSpritesRope, session.CurrentRotation); switch (trackSequence) diff --git a/src/openrct2/ride/thrill/TopSpin.cpp b/src/openrct2/ride/thrill/TopSpin.cpp index f05ae39e8d..bd5b1a16bf 100644 --- a/src/openrct2/ride/thrill/TopSpin.cpp +++ b/src/openrct2/ride/thrill/TopSpin.cpp @@ -197,7 +197,7 @@ static void PaintTopSpin( TrackPaintUtilPaintFloor(session, edges, session.TrackColours, height, kFloorSpritesCork, stationObject); TrackPaintUtilPaintFences( - session, edges, session.MapPosition, trackElement, ride, stationColour, height, fenceSpritesRope, + session, edges, session.MapPosition, trackElement, ride, stationColour, height, kFenceSpritesRope, session.CurrentRotation); switch (trackSequence) diff --git a/src/openrct2/ride/thrill/Twist.cpp b/src/openrct2/ride/thrill/Twist.cpp index 597211e5a3..8a4a18cc0c 100644 --- a/src/openrct2/ride/thrill/Twist.cpp +++ b/src/openrct2/ride/thrill/Twist.cpp @@ -117,7 +117,7 @@ static void PaintTwist( default: TrackPaintUtilPaintFences( session, edges, session.MapPosition, trackElement, ride, GetStationColourScheme(session, trackElement), height, - fenceSpritesRope, session.CurrentRotation); + kFenceSpritesRope, session.CurrentRotation); break; }