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

Correct failures

This commit is contained in:
duncanspumpkin 2022-03-11 13:55:01 +00:00
parent a5a00517ea
commit b7aa5ebd2e
3 changed files with 14 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/openrct2/ride/coaster/MineTrainCoaster.cpp
View File

@ -103,12 +103,11 @@ static void mine_train_rc_track_station(
}; };
PaintAddImageAsParentRotated( PaintAddImageAsParentRotated(
session, direction, imageIds[direction][1] | session.TrackColours[SCHEME_MISC], { 0, 0, height - 2}, { 32, 28, 1}, { 0, 2, session, direction, imageIds[direction][1] | session.TrackColours[SCHEME_MISC], { 0, 0, height - 2 }, { 32, 28, 1 },
height); { 0, 2, height });
if (trackElement.GetTrackType() == TrackElemType::EndStation) if (trackElement.GetTrackType() == TrackElemType::EndStation)
{ {
bool isClosed = trackElement.BlockBrakeClosed( bool isClosed = trackElement.BlockBrakeClosed();
});
PaintAddImageAsChildRotated( PaintAddImageAsChildRotated(
session, direction, _MineTrainBlockBrakeImages[direction][isClosed] | session.TrackColours[SCHEME_TRACK], 0, 0, 32, session, direction, _MineTrainBlockBrakeImages[direction][isClosed] | session.TrackColours[SCHEME_TRACK], 0, 0, 32,
20, 1, height, 0, 0, height); 20, 1, height, 0, 0, height);

11
src/openrct2/ride/coaster/WildMouse.cpp
View File

@ -201,12 +201,11 @@ static void wild_mouse_track_station(
int32_t trackType = trackElement.GetTrackType(); int32_t trackType = trackElement.GetTrackType();
PaintAddImageAsParentRotated( PaintAddImageAsParentRotated(
session, direction, baseImageIds[direction] | session.TrackColours[SCHEME_MISC], { 0, 0, height - 2}, { 32, 28, 2}, { 0, 2, session, direction, baseImageIds[direction] | session.TrackColours[SCHEME_MISC], { 0, 0, height - 2 }, { 32, 28, 2 },
height); { 0, 2, height });
if (trackType == TrackElemType::EndStation) if (trackType == TrackElemType::EndStation)
{ {
bool isClosed = trackElement.BlockBrakeClosed( bool isClosed = trackElement.BlockBrakeClosed();
});
PaintAddImageAsChildRotated( PaintAddImageAsChildRotated(
session, direction, _wild_mouse_block_brakes_image_ids[direction][isClosed] | session.TrackColours[SCHEME_TRACK], 0, session, direction, _wild_mouse_block_brakes_image_ids[direction][isClosed] | session.TrackColours[SCHEME_TRACK], 0,
0, 32, 20, 2, height, 0, 0, height); 0, 32, 20, 2, height, 0, 0, height);

8
src/openrct2/ride/transport/MiniatureRailway.cpp
View File

@ -674,16 +674,16 @@ static void paint_miniature_railway_track_flat(
imageId = miniature_railway_track_pieces_flat[direction] | session.TrackColours[SCHEME_TRACK]; imageId = miniature_railway_track_pieces_flat[direction] | session.TrackColours[SCHEME_TRACK];
if (!paintAsGravel) if (!paintAsGravel)
{ {
PaintAddImageAsParentRotated(session, direction, imageId, { 0, 6, height}, { 32, 20, 2}, { 0, 6, height); PaintAddImageAsParentRotated(session, direction, imageId, { 0, 6, height }, { 32, 20, 2 }, { 0, 6, height });
} }
else else
{ {
imageIdAlt = miniature_railway_track_to_gravel(imageId}); imageIdAlt = miniature_railway_track_to_gravel(imageId);
PaintAddImageAsParentRotated(session, direction, imageIdAlt, { 0, 6, height}, { 32, 20, 2}, { 0, 6, height); PaintAddImageAsParentRotated(session, direction, imageIdAlt, { 0, 6, height }, { 32, 20, 2 }, { 0, 6, height });
} }
if (paintGrooved) if (paintGrooved)
{ {
imageIdAlt = miniature_railway_track_to_grooved(imageId}); imageIdAlt = miniature_railway_track_to_grooved(imageId);
PaintAddImageAsParentRotated(session, direction, imageIdAlt, { 0, 6, height }, { 32, 20, 2 }, { 0, 6, height + 2 }); PaintAddImageAsParentRotated(session, direction, imageIdAlt, { 0, 6, height }, { 32, 20, 2 }, { 0, 6, height + 2 });
imageIdAlt = miniature_railway_track_to_grooved_indent( imageIdAlt = miniature_railway_track_to_grooved_indent(
imageId, session.PathElementOnSameHeight, direction, session.CurrentRotation); imageId, session.PathElementOnSameHeight, direction, session.CurrentRotation);