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

Fix #8456: Junior booster track piece doesn't connect properly

This commit is contained in:
Michael Steenbeek 2018-12-18 22:41:01 +01:00 committed by GitHub
parent 5463dde932
commit 38b26e0ac4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 9 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
distribution/changelog.txt
View File

@ -43,6 +43,7 @@
- Fix: [#8433] Crash if master server response is not valid JSON.
- Fix: [#8434] Crash if curl_easy_init fails.
- Fix: [#8443] Crash when selecting the current vehicle for ride that has none available.
- Fix: [#8456] Junior booster track piece doesn't connect properly.
- Fix: [#8464] Crash on game shutdown.
- Fix: [#8469] Crash modifying colour on hacked rides.
- Improved: [#2940] Allow mouse-dragging to set patrol area (Singleplayer only).

8
resources/g2/sprites.json
View File

@ -255,10 +255,14 @@
"path": "track/bm/booster_2.png"
},
{
"path": "track/junior/booster_1.png"
"path": "track/junior/booster_1.png",
"x_offset": -21,
"y_offset": 0
},
{
"path": "track/junior/booster_2.png"
"path": "track/junior/booster_2.png",
"x_offset": -22,
"y_offset": 1
},
{
"path": "icons/mute.png"

13
src/openrct2/ride/coaster/JuniorRollerCoaster.cpp
View File

@ -5643,24 +5643,15 @@ static void junior_rc_booster_paint_setup(
paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
const TileElement* tileElement)
{
int32_t XoffsetNESW = 12;
int32_t YoffsetNESW = -10;
int32_t XoffsetNWSE = 10;
int32_t YoffsetNWSE = -10;
if (direction & 1)
{
sub_98196C(
session, SPR_JUNIOR_RC_BOOSTER_NE_SW | session->TrackColours[SCHEME_TRACK], XoffsetNESW, YoffsetNESW, 20, 32, 1,
height);
sub_98196C(session, SPR_JUNIOR_RC_BOOSTER_NE_SW | session->TrackColours[SCHEME_TRACK], 0, 0, 20, 32, 1, height);
paint_util_push_tunnel_right(session, height, TUNNEL_0);
}
else
{
sub_98196C(
session, SPR_JUNIOR_RC_BOOSTER_NW_SE | session->TrackColours[SCHEME_TRACK], XoffsetNWSE, YoffsetNWSE, 32, 20, 1,
height);
sub_98196C(session, SPR_JUNIOR_RC_BOOSTER_NW_SE | session->TrackColours[SCHEME_TRACK], 0, 0, 32, 20, 1, height);
paint_util_push_tunnel_left(session, height, TUNNEL_0);
}