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

Fix #18755: Ferris Wheel and Circus ghosts not coloured correctly

This commit is contained in:
GalBr 2022-12-04 21:11:11 +02:00 committed by GitHub
parent 3dfe1eedb6
commit 8d4979588e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
distribution/changelog.txt
View File

@ -49,6 +49,7 @@
- Fix: [#18606] JSON objects do not take priority over the DAT files they supersede.
- Fix: [#18620] [Plugin] Crash when reading widget properties from windows that have both static and tab widgets.
- Fix: [#18653] Negative ratings multipliers do not appear in Vehicle tab
- Fix: [#18755] Ferris Wheel and Circus ghosts not coloured correctly.
0.4.2 (2022-10-05)
------------------------------------------------------------------------

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

@ -32,7 +32,7 @@ static void PaintCircusTent(PaintSession& session, const Ride& ride, uint8_t dir
auto imageTemplate = ImageId(0, ride.vehicle_colours[0].Body, ride.vehicle_colours[0].Trim);
auto imageFlags = session.TrackColours[SCHEME_MISC];
if (!imageFlags.HasPrimary())
if (imageFlags.ToUInt32() != IMAGE_TYPE_REMAP)
{
imageTemplate = imageFlags;
}

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

@ -79,7 +79,7 @@ static void PaintFerrisWheelStructure(
auto supportsImageTemplate = session.TrackColours[SCHEME_TRACK];
auto wheelImageTemplate = ImageId(0, ride.vehicle_colours[0].Body, ride.vehicle_colours[0].Trim);
auto wheelImageFlags = session.TrackColours[SCHEME_MISC];
if (!wheelImageFlags.HasPrimary())
if (wheelImageFlags.ToUInt32() != IMAGE_TYPE_REMAP)
{
wheelImageTemplate = wheelImageFlags;
}