From 1848c6601cfb68d543e9a07bf2ba4511a1c764c2 Mon Sep 17 00:00:00 2001 From: Harry-Hopkinson Date: Tue, 30 Apr 2024 20:07:44 +0000 Subject: [PATCH] Rename floorSpritesCork to kFloorSpritesCork --- src/openrct2/ride/TrackPaint.cpp | 7 ------- src/openrct2/ride/TrackPaint.h | 7 ++++++- src/openrct2/ride/gentle/Circus.cpp | 2 +- src/openrct2/ride/gentle/CrookedHouse.cpp | 2 +- src/openrct2/ride/gentle/FerrisWheel.cpp | 2 +- src/openrct2/ride/gentle/HauntedHouse.cpp | 2 +- src/openrct2/ride/gentle/MerryGoRound.cpp | 2 +- src/openrct2/ride/gentle/SpaceRings.cpp | 2 +- src/openrct2/ride/thrill/3dCinema.cpp | 2 +- src/openrct2/ride/thrill/Enterprise.cpp | 2 +- src/openrct2/ride/thrill/MotionSimulator.cpp | 2 +- src/openrct2/ride/thrill/TopSpin.cpp | 2 +- src/openrct2/ride/thrill/Twist.cpp | 2 +- 13 files changed, 17 insertions(+), 19 deletions(-) diff --git a/src/openrct2/ride/TrackPaint.cpp b/src/openrct2/ride/TrackPaint.cpp index 2bd4ad9394..b96aa6654d 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 floorSpritesCork[] = { - SPR_FLOOR_CORK_SE_SW, - SPR_FLOOR_CORK_SW, - SPR_FLOOR_CORK_SE, - SPR_FLOOR_CORK, -}; - const uint32_t floorSpritesMetal[] = { SPR_FLOOR_METAL, SPR_FLOOR_METAL, diff --git a/src/openrct2/ride/TrackPaint.h b/src/openrct2/ride/TrackPaint.h index b683f4d75a..aa52488deb 100644 --- a/src/openrct2/ride/TrackPaint.h +++ b/src/openrct2/ride/TrackPaint.h @@ -295,7 +295,12 @@ enum MAZE_ENTRY_FLAG_15 = (1 << 15), }; -extern const uint32_t floorSpritesCork[]; +constexpr uint32_t kFloorSpritesCork[] = { + SPR_FLOOR_CORK_SE_SW, + SPR_FLOOR_CORK_SW, + SPR_FLOOR_CORK_SE, + SPR_FLOOR_CORK, +}; extern const uint32_t floorSpritesMetal[]; extern const uint32_t floorSpritesMetalB[]; diff --git a/src/openrct2/ride/gentle/Circus.cpp b/src/openrct2/ride/gentle/Circus.cpp index 10b9b3d01b..bb1a6cfe84 100644 --- a/src/openrct2/ride/gentle/Circus.cpp +++ b/src/openrct2/ride/gentle/Circus.cpp @@ -62,7 +62,7 @@ static void PaintCircus( const StationObject* stationObject = ride.GetStationObject(); - TrackPaintUtilPaintFloor(session, edges, session.TrackColours, height, floorSpritesCork, stationObject); + TrackPaintUtilPaintFloor(session, edges, session.TrackColours, height, kFloorSpritesCork, stationObject); TrackPaintUtilPaintFences( session, edges, session.MapPosition, trackElement, ride, session.SupportColours, height, fenceSpritesRope, diff --git a/src/openrct2/ride/gentle/CrookedHouse.cpp b/src/openrct2/ride/gentle/CrookedHouse.cpp index a94a0b6ec3..d99adb1f7a 100644 --- a/src/openrct2/ride/gentle/CrookedHouse.cpp +++ b/src/openrct2/ride/gentle/CrookedHouse.cpp @@ -95,7 +95,7 @@ static void PaintCrookedHouse( GetStationColourScheme(session, trackElement)); const StationObject* stationObject = ride.GetStationObject(); - TrackPaintUtilPaintFloor(session, edges, session.TrackColours, height, floorSpritesCork, stationObject); + TrackPaintUtilPaintFloor(session, edges, session.TrackColours, height, kFloorSpritesCork, stationObject); TrackPaintUtilPaintFences( session, edges, session.MapPosition, trackElement, ride, GetStationColourScheme(session, trackElement), height, diff --git a/src/openrct2/ride/gentle/FerrisWheel.cpp b/src/openrct2/ride/gentle/FerrisWheel.cpp index 19656d4ab1..b8440d676b 100644 --- a/src/openrct2/ride/gentle/FerrisWheel.cpp +++ b/src/openrct2/ride/gentle/FerrisWheel.cpp @@ -124,7 +124,7 @@ static void PaintFerrisWheel( const StationObject* stationObject = ride.GetStationObject(); - TrackPaintUtilPaintFloor(session, edges, session.TrackColours, height, floorSpritesCork, stationObject); + TrackPaintUtilPaintFloor(session, edges, session.TrackColours, height, kFloorSpritesCork, stationObject); ImageId imageId; uint8_t rotation = session.CurrentRotation; diff --git a/src/openrct2/ride/gentle/HauntedHouse.cpp b/src/openrct2/ride/gentle/HauntedHouse.cpp index 4ff1f2fe04..9d1398a96c 100644 --- a/src/openrct2/ride/gentle/HauntedHouse.cpp +++ b/src/openrct2/ride/gentle/HauntedHouse.cpp @@ -76,7 +76,7 @@ static void PaintHauntedHouse( const StationObject* stationObject = ride.GetStationObject(); - TrackPaintUtilPaintFloor(session, edges, session.TrackColours, height, floorSpritesCork, stationObject); + TrackPaintUtilPaintFloor(session, edges, session.TrackColours, height, kFloorSpritesCork, stationObject); TrackPaintUtilPaintFences( session, edges, session.MapPosition, trackElement, ride, GetStationColourScheme(session, trackElement), height, diff --git a/src/openrct2/ride/gentle/MerryGoRound.cpp b/src/openrct2/ride/gentle/MerryGoRound.cpp index 0d0ff9d150..c9052ceeae 100644 --- a/src/openrct2/ride/gentle/MerryGoRound.cpp +++ b/src/openrct2/ride/gentle/MerryGoRound.cpp @@ -117,7 +117,7 @@ static void PaintMerryGoRound( const StationObject* stationObject = ride.GetStationObject(); - TrackPaintUtilPaintFloor(session, edges, session.TrackColours, height, floorSpritesCork, stationObject); + TrackPaintUtilPaintFloor(session, edges, session.TrackColours, height, kFloorSpritesCork, stationObject); TrackPaintUtilPaintFences( session, edges, session.MapPosition, trackElement, ride, GetStationColourScheme(session, trackElement), height, diff --git a/src/openrct2/ride/gentle/SpaceRings.cpp b/src/openrct2/ride/gentle/SpaceRings.cpp index ab2fcaba1f..773d23aeeb 100644 --- a/src/openrct2/ride/gentle/SpaceRings.cpp +++ b/src/openrct2/ride/gentle/SpaceRings.cpp @@ -101,7 +101,7 @@ static void PaintSpaceRings( session, WoodenSupportType::Truss, WoodenSupportSubType::NeSw, direction, height, stationColour); const StationObject* stationObject = ride.GetStationObject(); - TrackPaintUtilPaintFloor(session, edges, session.TrackColours, height, floorSpritesCork, stationObject); + TrackPaintUtilPaintFloor(session, edges, session.TrackColours, height, kFloorSpritesCork, stationObject); switch (trackSequence) { diff --git a/src/openrct2/ride/thrill/3dCinema.cpp b/src/openrct2/ride/thrill/3dCinema.cpp index 141cba8e92..1a69c85af3 100644 --- a/src/openrct2/ride/thrill/3dCinema.cpp +++ b/src/openrct2/ride/thrill/3dCinema.cpp @@ -64,7 +64,7 @@ static void Paint3dCinema( const StationObject* stationObject = ride.GetStationObject(); - TrackPaintUtilPaintFloor(session, edges, session.TrackColours, height, floorSpritesCork, stationObject); + TrackPaintUtilPaintFloor(session, edges, session.TrackColours, height, kFloorSpritesCork, stationObject); TrackPaintUtilPaintFences( session, edges, session.MapPosition, trackElement, ride, stationColour, height, fenceSpritesRope, diff --git a/src/openrct2/ride/thrill/Enterprise.cpp b/src/openrct2/ride/thrill/Enterprise.cpp index 6f4ba1e89a..b69c8e1fe5 100644 --- a/src/openrct2/ride/thrill/Enterprise.cpp +++ b/src/openrct2/ride/thrill/Enterprise.cpp @@ -102,7 +102,7 @@ static void PaintEnterprise( GetStationColourScheme(session, trackElement)); const StationObject* stationObject = ride.GetStationObject(); - TrackPaintUtilPaintFloor(session, edges, session.TrackColours, height, floorSpritesCork, stationObject); + TrackPaintUtilPaintFloor(session, edges, session.TrackColours, height, kFloorSpritesCork, stationObject); TrackPaintUtilPaintFences( session, edges, session.MapPosition, trackElement, ride, session.TrackColours, height, fenceSpritesRope, diff --git a/src/openrct2/ride/thrill/MotionSimulator.cpp b/src/openrct2/ride/thrill/MotionSimulator.cpp index 52686d51dd..801b8bd76c 100644 --- a/src/openrct2/ride/thrill/MotionSimulator.cpp +++ b/src/openrct2/ride/thrill/MotionSimulator.cpp @@ -116,7 +116,7 @@ static void PaintMotionSimulator( const StationObject* stationObject = ride.GetStationObject(); - TrackPaintUtilPaintFloor(session, edges, session.TrackColours, height, floorSpritesCork, stationObject); + TrackPaintUtilPaintFloor(session, edges, session.TrackColours, height, kFloorSpritesCork, stationObject); TrackPaintUtilPaintFences( session, edges, session.MapPosition, trackElement, ride, session.SupportColours, height, fenceSpritesRope, diff --git a/src/openrct2/ride/thrill/TopSpin.cpp b/src/openrct2/ride/thrill/TopSpin.cpp index 75032b6976..f05ae39e8d 100644 --- a/src/openrct2/ride/thrill/TopSpin.cpp +++ b/src/openrct2/ride/thrill/TopSpin.cpp @@ -194,7 +194,7 @@ static void PaintTopSpin( const StationObject* stationObject = ride.GetStationObject(); - TrackPaintUtilPaintFloor(session, edges, session.TrackColours, height, floorSpritesCork, stationObject); + TrackPaintUtilPaintFloor(session, edges, session.TrackColours, height, kFloorSpritesCork, stationObject); TrackPaintUtilPaintFences( session, edges, session.MapPosition, trackElement, ride, stationColour, height, fenceSpritesRope, diff --git a/src/openrct2/ride/thrill/Twist.cpp b/src/openrct2/ride/thrill/Twist.cpp index 82f06c7519..597211e5a3 100644 --- a/src/openrct2/ride/thrill/Twist.cpp +++ b/src/openrct2/ride/thrill/Twist.cpp @@ -98,7 +98,7 @@ static void PaintTwist( session, WoodenSupportType::Truss, WoodenSupportSubType::NeSw, direction, height, stationColour); const StationObject* stationObject = ride.GetStationObject(); - TrackPaintUtilPaintFloor(session, edges, stationColour, height, floorSpritesCork, stationObject); + TrackPaintUtilPaintFloor(session, edges, stationColour, height, kFloorSpritesCork, stationObject); switch (trackSequence) {