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

Simplify some arg passing on PaintAddImageAsParent

This commit is contained in:
ZehMatt 2021-08-20 23:30:14 +03:00
parent 77b06cbf9a
commit 15e32ce5f8
No known key found for this signature in database
GPG Key ID: 18CE582C71A225B0
1 changed files with 15 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1442,9 +1442,7 @@ static void paint_miniature_railway_track_left_eighth_to_diag(
bounds = miniature_railway_track_pieces_right_eight_to_orthog_bounds[direction][index];
offset = miniature_railway_track_pieces_right_eight_to_orthog_offset[direction][index];
}
PaintAddImageAsParent(
session, imageId, { 0, 0, height }, { bounds.x, bounds.y, static_cast<int8_t>(bounds.z) },
{ offset.x, offset.y, height });
PaintAddImageAsParent(session, imageId, { 0, 0, height }, bounds, { offset, height });
}
}
else
@ -1453,9 +1451,7 @@ static void paint_miniature_railway_track_left_eighth_to_diag(
| session->TrackColours[SCHEME_SUPPORTS];
CoordsXY offset = miniature_railway_track_floor_pieces_left_eight_to_diag_offset[direction][trackSequence];
CoordsXYZ bounds = miniature_railway_track_floor_pieces_left_eight_to_diag_bounds[direction][trackSequence];
PaintAddImageAsParent(
session, imageId, { 0, 0, height }, { bounds.x, bounds.y, static_cast<int8_t>(bounds.z) },
{ offset.x, offset.y, height });
PaintAddImageAsParent(session, imageId, { 0, 0, height }, bounds, { offset, height });
int8_t index = paint_miniature_railway_eighth_to_diag_index[trackSequence];
if (index >= 0)
@ -1584,9 +1580,7 @@ static void paint_miniature_railway_track_right_eighth_to_diag(
bounds = miniature_railway_track_pieces_left_eight_to_orthog_bounds[direction][index];
offset = miniature_railway_track_pieces_left_eight_to_orthog_offset[direction][index];
}
PaintAddImageAsParent(
session, imageId, { 0, 0, height }, { bounds.x, bounds.y, static_cast<int8_t>(bounds.z) },
{ offset.x, offset.y, height });
PaintAddImageAsParent(session, imageId, { 0, 0, height }, bounds, { offset, height });
}
}
else
@ -1595,9 +1589,7 @@ static void paint_miniature_railway_track_right_eighth_to_diag(
| session->TrackColours[SCHEME_SUPPORTS];
CoordsXY offset = miniature_railway_track_floor_pieces_right_eight_to_diag_offset[direction][trackSequence];
CoordsXYZ bounds = miniature_railway_track_floor_pieces_right_eight_to_diag_bounds[direction][trackSequence];
PaintAddImageAsParent(
session, imageId, { 0, 0, height }, { bounds.x, bounds.y, static_cast<int8_t>(bounds.z) },
{ offset.x, offset.y, height });
PaintAddImageAsParent(session, imageId, { 0, 0, height }, bounds, { offset, height });
int8_t index = paint_miniature_railway_eighth_to_diag_index[trackSequence];
if (index >= 0)
@ -1714,7 +1706,7 @@ static void miniature_railway_track_diag_flat(
{
PaintAddImageAsParent(
session, floorImage | session->TrackColours[SCHEME_SUPPORTS], { 0, 0, height },
{ floorBoundSize.x, floorBoundSize.y, (drawRail ? 2 : 0) }, { floorBoundOffset.x, floorBoundOffset.y, height });
{ floorBoundSize, (drawRail ? 2 : 0) }, { floorBoundOffset, height });
if (drawRail)
{
PaintAddImageAsChild(
@ -1809,9 +1801,8 @@ static void miniature_railway_track_diag_25_deg_up(
{
PaintAddImageAsParent(
session, floorImage | session->TrackColours[SCHEME_SUPPORTS],
{ 0, 0, height + offsetsB[direction][trackSequence][0] },
{ floorBoundSize.x, floorBoundSize.y, (drawRail ? 2 : 0) },
{ floorBoundOffset.x, floorBoundOffset.y, height + offsetsB[direction][trackSequence][1] });
{ 0, 0, height + offsetsB[direction][trackSequence][0] }, { floorBoundSize, (drawRail ? 2 : 0) },
{ floorBoundOffset, height + offsetsB[direction][trackSequence][1] });
if (drawRail)
{
PaintAddImageAsChild(
@ -1863,7 +1854,7 @@ static void miniature_railway_track_diag_flat_to_25_deg_up(
{
PaintAddImageAsParent(
session, floorImage | session->TrackColours[SCHEME_SUPPORTS], { 0, 0, height },
{ floorBoundSize.x, floorBoundSize.y, (drawRail ? 2 : 0) }, { floorBoundOffset.x, floorBoundOffset.y, height });
{ floorBoundSize, (drawRail ? 2 : 0) }, { floorBoundOffset, height });
if (drawRail)
{
PaintAddImageAsChild(
@ -1937,9 +1928,8 @@ static void miniature_railway_track_diag_25_deg_up_to_flat(
{
PaintAddImageAsParent(
session, floorImage | session->TrackColours[SCHEME_SUPPORTS],
{ 0, 0, height + offsetsB[direction][trackSequence][0] },
{ floorBoundSize.x, floorBoundSize.y, (drawRail ? 2 : 0) },
{ floorBoundOffset.x, floorBoundOffset.y, height + offsetsB[direction][trackSequence][1] });
{ 0, 0, height + offsetsB[direction][trackSequence][0] }, { floorBoundSize, (drawRail ? 2 : 0) },
{ floorBoundOffset, height + offsetsB[direction][trackSequence][1] });
if (drawRail)
{
PaintAddImageAsChild(
@ -2013,9 +2003,8 @@ static void miniature_railway_track_diag_25_deg_down(
{
PaintAddImageAsParent(
session, floorImage | session->TrackColours[SCHEME_SUPPORTS],
{ 0, 0, height + offsetsB[direction][trackSequence][0] },
{ floorBoundSize.x, floorBoundSize.y, (drawRail ? 2 : 0) },
{ floorBoundOffset.x, floorBoundOffset.y, height + offsetsB[direction][trackSequence][1] });
{ 0, 0, height + offsetsB[direction][trackSequence][0] }, { floorBoundSize, (drawRail ? 2 : 0) },
{ floorBoundOffset, height + offsetsB[direction][trackSequence][1] });
if (drawRail)
{
PaintAddImageAsChild(
@ -2088,9 +2077,8 @@ static void miniature_railway_track_diag_flat_to_25_deg_down(
{
PaintAddImageAsParent(
session, floorImage | session->TrackColours[SCHEME_SUPPORTS],
{ 0, 0, height + offsetsB[direction][trackSequence][0] },
{ floorBoundSize.x, floorBoundSize.y, (drawRail ? 2 : 0) },
{ floorBoundOffset.x, floorBoundOffset.y, height + offsetsB[direction][trackSequence][1] });
{ 0, 0, height + offsetsB[direction][trackSequence][0] }, { floorBoundSize, (drawRail ? 2 : 0) },
{ floorBoundOffset, height + offsetsB[direction][trackSequence][1] });
if (drawRail)
{
PaintAddImageAsChild(
@ -2140,7 +2128,7 @@ static void miniature_railway_track_diag_25_deg_down_to_flat(
{
PaintAddImageAsParent(
session, floorImage | session->TrackColours[SCHEME_SUPPORTS], { 0, 0, height },
{ floorBoundSize.x, floorBoundSize.y, (drawRail ? 2 : 0) }, { floorBoundOffset.x, floorBoundOffset.y, height });
{ floorBoundSize, (drawRail ? 2 : 0) }, { floorBoundOffset, height });
if (drawRail)
{
PaintAddImageAsChild(