diff --git a/distribution/changelog.txt b/distribution/changelog.txt index 635b4059dd..96f12f74b5 100644 --- a/distribution/changelog.txt +++ b/distribution/changelog.txt @@ -4,6 +4,7 @@ - Fix: [#1972, #11679] Vehicles passing by toilets can cause them to glitch (original bug). - Fix: [#9999, #10000, #10001, #10002, #10003] Truncated scenario strings when using Catalan, Czech, Japanese, Polish or Russian. - Fix: [#16357] Chairlift station covers draw incorrectly. +- Fix: [#16657] Mine Ride right S-bend uses Mini Roller Coaster sprite (original bug). - Fix: [#18436] Scenery on the same tile as steep to vertical track can draw over the track (original bug). - Fix: [#21768] Dirty blocks debug overlay is rendered incorrectly on high DPI screens. - Fix: [#22229] Opening a park save file from a newer version of OpenRCT2 yields an unhelpful error message. diff --git a/resources/g2/sprites.json b/resources/g2/sprites.json index 201f0062aa..d3c47c0317 100644 --- a/resources/g2/sprites.json +++ b/resources/g2/sprites.json @@ -23369,6 +23369,11 @@ "y": 7, "palette": "keep" }, + { + "path": "track/mine_ride/19471.png", + "x": -32, + "y": -4 + }, { "path": "support/flat_to_steep_1_1.png", "x": -32, diff --git a/resources/g2/track/mine_ride/19471.png b/resources/g2/track/mine_ride/19471.png new file mode 100644 index 0000000000..516a2c45cc Binary files /dev/null and b/resources/g2/track/mine_ride/19471.png differ diff --git a/src/openrct2/SpriteIds.h b/src/openrct2/SpriteIds.h index 9c1e7b5777..181fc300eb 100644 --- a/src/openrct2/SpriteIds.h +++ b/src/openrct2/SpriteIds.h @@ -1543,9 +1543,13 @@ enum : ImageIndex SPR_G2_BOAT_HIRE_TRACK_S_BEND = SPR_G2_BOAT_HIRE_TRACK_FLAT_DIAGONAL + 3, SPR_G2_BOAT_HIRE_END = SPR_G2_BOAT_HIRE_TRACK_S_BEND + 32, + SPR_G2_MINE_RIDE_BEGIN = SPR_G2_BOAT_HIRE_END, + SPR_G2_MINE_RIDE_TRACK_19471 = SPR_G2_MINE_RIDE_BEGIN, + SPR_G2_MINE_RIDE_END = SPR_G2_MINE_RIDE_TRACK_19471 + 1, + // G2 Supports - SPR_G2_SUPPORT_WOODEN_TRUSS = SPR_G2_BOAT_HIRE_END, + SPR_G2_SUPPORT_WOODEN_TRUSS = SPR_G2_MINE_RIDE_END, SPR_G2_SUPPORT_WOODEN_MINE = SPR_G2_SUPPORT_WOODEN_TRUSS + 32, SPR_G2_SUPPORT_END = SPR_G2_SUPPORT_WOODEN_MINE + 32, diff --git a/src/openrct2/paint/track/coaster/MineRide.cpp b/src/openrct2/paint/track/coaster/MineRide.cpp index 956ef34c0d..78887a0d17 100644 --- a/src/openrct2/paint/track/coaster/MineRide.cpp +++ b/src/openrct2/paint/track/coaster/MineRide.cpp @@ -1228,7 +1228,7 @@ static void MineRideTrackSBendRight( break; case 2: PaintAddImageAsParentRotated( - session, direction, session.TrackColours.WithIndex(19471), { 0, 0, height }, + session, direction, session.TrackColours.WithIndex(SPR_G2_MINE_RIDE_TRACK_19471), { 0, 0, height }, { { 0, 6, height }, { 32, 20, 3 } }); break; case 3: @@ -1323,7 +1323,7 @@ static void MineRideTrackSBendRight( { case 0: PaintAddImageAsParentRotated( - session, direction, session.TrackColours.WithIndex(19471), { 0, 0, height }, + session, direction, session.TrackColours.WithIndex(SPR_G2_MINE_RIDE_TRACK_19471), { 0, 0, height }, { { 0, 6, height }, { 32, 20, 3 } }); break; case 1: