Rename floorSpritesCork to kFloorSpritesCork

This commit is contained in:
Harry-Hopkinson 2024-04-30 20:07:44 +00:00 committed by Harry Hopkinson
parent 8cc240f527
commit 1848c6601c
13 changed files with 17 additions and 19 deletions

View File

@ -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,

View File

@ -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[];

View File

@ -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,

View File

@ -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,

View File

@ -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;

View File

@ -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,

View File

@ -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,

View File

@ -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)
{

View File

@ -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,

View File

@ -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,

View File

@ -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,

View File

@ -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,

View File

@ -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)
{