mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-01-06 06:32:56 +01:00
Code Issues Releases Wiki Activity

Fix reverse freefall photo using the wrong track sprite

Browse Source 
This fixes the on ride photo of the reverse freefall coaster having incorrectly coloured ties due to using a sprite from the air powered coaster. This uses the station sprite from the reverse freefall coaster instead.

This removes this special case in the paint code. If I remember right, it's the only function that changes colors in this way.
This commit is contained in:
mix
2025-09-09 22:23:10 +01:00
committed by GitHub
parent 845a0c597c
commit 318262b479
2 changed files with 3 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
distribution/changelog.txt
View File

@@ -1,6 +1,7 @@
0.4.27 (in development)
------------------------------------------------------------------------
- Improved: [#2296, #2307] The land tool now takes sloped track and paths into account when modifying land.
- Fix: [#25131] The Reverse Freefall Coaster On-ride photo section track has incorrectly coloured ties.
- Fix: [#25132] Crash when trying to use simulate on incomplete ride.
0.4.26 (2025-09-06)

19
src/openrct2/paint/track/coaster/ReverseFreefallCoaster.cpp
View File

@@ -391,27 +391,12 @@ static void PaintReverseFreefallRCOnridePhoto(
PaintSession& session, const Ride& ride, uint8_t trackSequence, uint8_t direction, int32_t height,
const TrackElement& trackElement, SupportType supportType)
{
static constexpr uint32_t imageIds[4] = {
SPR_AIR_POWERED_VERTICAL_RC_FLAT_SW_NE,
SPR_AIR_POWERED_VERTICAL_RC_FLAT_NW_SE,
SPR_AIR_POWERED_VERTICAL_RC_FLAT_SW_NE,
SPR_AIR_POWERED_VERTICAL_RC_FLAT_NW_SE,
};
// The straight track without booster is borrowed from the APVC.
// It has one track colour, instead of the two that the Reverse Freefall Colour has.
auto colour = session.TrackColours;
if (!trackElement.IsGhost() && !trackElement.IsHighlighted())
{
colour = colour.WithPrimary(colour.GetSecondary());
}
PaintAddImageAsParentRotated(
session, direction, colour.WithIndex(imageIds[direction]), { 0, 0, height }, { { 0, 6, height }, { 32, 20, 1 } });
session, direction, session.TrackColours.WithIndex(kPiecesStation[direction]), { 0, 0, height },
{ { 0, 6, height }, { 32, 20, 1 } });
DrawSupportForSequenceA<TrackElemType::OnRidePhoto>(
session, supportType.wooden, trackSequence, direction, height, session.SupportColours);
;
TrackPaintUtilOnridePhotoPaint2(session, direction, trackElement, height);
}