From cde0cb123d096a342d0a39618afff4b696cc16bc Mon Sep 17 00:00:00 2001 From: Harry-Hopkinson Date: Tue, 30 Apr 2024 20:17:39 +0000 Subject: [PATCH] Rename floorSpritesMetalB to kFloorSpritesMetalB --- src/openrct2/ride/TrackPaint.cpp | 7 ------- src/openrct2/ride/TrackPaint.h | 7 ++++++- src/openrct2/ride/gentle/ObservationTower.cpp | 2 +- src/openrct2/ride/thrill/RotoDrop.cpp | 2 +- 4 files changed, 8 insertions(+), 10 deletions(-) diff --git a/src/openrct2/ride/TrackPaint.cpp b/src/openrct2/ride/TrackPaint.cpp index 8c776f3010..62f588cfa0 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 floorSpritesMetalB[] = { - SPR_FLOOR_METAL_B, - SPR_FLOOR_METAL_B, - SPR_FLOOR_METAL_B, - SPR_FLOOR_METAL_B, -}; - const uint32_t fenceSpritesRope[] = { SPR_FENCE_ROPE_NE, SPR_FENCE_ROPE_SE, diff --git a/src/openrct2/ride/TrackPaint.h b/src/openrct2/ride/TrackPaint.h index 090a944bf2..b79c8b7076 100644 --- a/src/openrct2/ride/TrackPaint.h +++ b/src/openrct2/ride/TrackPaint.h @@ -307,7 +307,12 @@ constexpr uint32_t kFloorSpritesMetal[] = { SPR_FLOOR_METAL, SPR_FLOOR_METAL, }; -extern const uint32_t floorSpritesMetalB[]; +constexpr uint32_t kFloorSpritesMetalB[] = { + SPR_FLOOR_METAL_B, + SPR_FLOOR_METAL_B, + SPR_FLOOR_METAL_B, + SPR_FLOOR_METAL_B, +}; extern const uint32_t fenceSpritesRope[]; extern const uint32_t fenceSpritesMetal[]; diff --git a/src/openrct2/ride/gentle/ObservationTower.cpp b/src/openrct2/ride/gentle/ObservationTower.cpp index b6ed3be249..1716686421 100644 --- a/src/openrct2/ride/gentle/ObservationTower.cpp +++ b/src/openrct2/ride/gentle/ObservationTower.cpp @@ -96,7 +96,7 @@ static void PaintObservationTowerBase( const StationObject* stationObject = ride.GetStationObject(); - TrackPaintUtilPaintFloor(session, edges, session.SupportColours, height, floorSpritesMetalB, stationObject); + TrackPaintUtilPaintFloor(session, edges, session.SupportColours, height, kFloorSpritesMetalB, stationObject); TrackPaintUtilPaintFences( session, edges, position, trackElement, ride, session.TrackColours, height, fenceSpritesMetalB, diff --git a/src/openrct2/ride/thrill/RotoDrop.cpp b/src/openrct2/ride/thrill/RotoDrop.cpp index 762e655f96..892b799a88 100644 --- a/src/openrct2/ride/thrill/RotoDrop.cpp +++ b/src/openrct2/ride/thrill/RotoDrop.cpp @@ -115,7 +115,7 @@ static void PaintRotoDropBase( const StationObject* stationObject = ride.GetStationObject(); - TrackPaintUtilPaintFloor(session, edges, session.SupportColours, height, floorSpritesMetalB, stationObject); + TrackPaintUtilPaintFloor(session, edges, session.SupportColours, height, kFloorSpritesMetalB, stationObject); TrackPaintUtilPaintFences( session, edges, session.MapPosition, trackElement, ride, session.TrackColours, height, fenceSpritesMetalB,