mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-01-06 06:32:56 +01:00
Code Issues Releases Wiki Activity

Improve readability on ride_create_vehicles_find_first_block

Browse Source
This commit is contained in:
Tulio Leao
2019-12-24 09:16:39 -03:00
parent 0c2e5747b8
commit ef31ce8149
1 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/openrct2/ride/Ride.cpp
View File

@@ -4692,21 +4692,21 @@ static void vehicle_unset_update_flag_b1(rct_vehicle* head)
static void ride_create_vehicles_find_first_block(Ride* ride, CoordsXYE* outXYElement)
{
rct_vehicle* vehicle = GET_VEHICLE(ride->vehicles[0]);
auto firstPos = CoordsXYZ{ vehicle->track_x, vehicle->track_y, vehicle->track_z };
auto firstElement = map_get_track_element_at(firstPos);
auto curTrackPos = CoordsXYZ{ vehicle->track_x, vehicle->track_y, vehicle->track_z };
auto curTrackElement = map_get_track_element_at(curTrackPos);
assert(firstElement != nullptr);
assert(curTrackElement != nullptr);
int32_t x = firstPos.x;
int32_t y = firstPos.y;
auto trackElement = firstElement;
int32_t x = curTrackPos.x;
int32_t y = curTrackPos.y;
auto trackElement = curTrackElement;
track_begin_end trackBeginEnd;
while (track_block_get_previous(x, y, reinterpret_cast<TileElement*>(trackElement), &trackBeginEnd))
{
x = trackBeginEnd.end_x;
y = trackBeginEnd.end_y;
trackElement = trackBeginEnd.begin_element->AsTrack();
if (x == firstPos.x && y == firstPos.y && trackElement == firstElement)
if (x == curTrackPos.x && y == curTrackPos.y && trackElement == curTrackElement)
{
break;
}
@@ -4750,9 +4750,9 @@ static void ride_create_vehicles_find_first_block(Ride* ride, CoordsXYE* outXYEl
}
}
outXYElement->x = firstPos.x;
outXYElement->y = firstPos.y;
outXYElement->element = reinterpret_cast<TileElement*>(firstElement);
outXYElement->x = curTrackPos.x;
outXYElement->y = curTrackPos.y;
outXYElement->element = reinterpret_cast<TileElement*>(curTrackElement);
}
/**