mirrors
/
OpenRCT2
mirror of https://github.com/OpenRCT2/OpenRCT2.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Rename fenceSpritesRope to kFenceSpritesRope

This commit is contained in:
Harry-Hopkinson 2024-04-30 20:20:37 +00:00 committed by Harry Hopkinson
parent cde0cb123d
commit 4dbb49508d
11 changed files with 15 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/openrct2/ride/TrackPaint.cpp
View File

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

7
src/openrct2/ride/TrackPaint.h
View File

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

2
src/openrct2/ride/gentle/Circus.cpp
View File

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

2
src/openrct2/ride/gentle/CrookedHouse.cpp
View File

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

2
src/openrct2/ride/gentle/HauntedHouse.cpp
View File

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

2
src/openrct2/ride/gentle/MerryGoRound.cpp
View File

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

2
src/openrct2/ride/thrill/3dCinema.cpp
View File

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

2
src/openrct2/ride/thrill/Enterprise.cpp
View File

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

2
src/openrct2/ride/thrill/MotionSimulator.cpp
View File

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

2
src/openrct2/ride/thrill/TopSpin.cpp
View File

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

2
src/openrct2/ride/thrill/Twist.cpp
View File

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