mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-01-16 11:33:03 +01:00
Code Issues Releases Wiki Activity

Fix #14918 rename eax and refactor while loop to avoid overflow

Browse Source
This commit is contained in:
saad
2021-07-30 19:34:42 +04:00
parent fd823c8acb
commit ab96ca8516
1 changed files with 19 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
src/openrct2-ui/windows/Ride.cpp
View File

@@ -1559,7 +1559,7 @@ static void window_ride_init_viewport(rct_window* w)
if (ride == nullptr)
return;
int32_t eax = w->viewport_focus_coordinates.var_480 - 1;
int32_t viewSelectionIndex = w->viewport_focus_coordinates.var_480 - 1;
union
{
@@ -1576,9 +1576,9 @@ static void window_ride_init_viewport(rct_window* w)
focus.coordinate.width = 0;
focus.coordinate.height = 0;
if (eax >= 0 && eax < ride->num_vehicles && ride->lifecycle_flags & RIDE_LIFECYCLE_ON_TRACK)
if (viewSelectionIndex >= 0 && viewSelectionIndex < ride->num_vehicles && ride->lifecycle_flags & RIDE_LIFECYCLE_ON_TRACK)
{
focus.sprite.sprite_id = ride->vehicles[eax];
focus.sprite.sprite_id = ride->vehicles[viewSelectionIndex];
rct_ride_entry* ride_entry = ride->GetRideEntry();
if (ride_entry && ride_entry->tab_vehicle != 0)
@@ -1598,28 +1598,30 @@ static void window_ride_init_viewport(rct_window* w)
focus.sprite.type |= VIEWPORT_FOCUS_TYPE_SPRITE;
}
}
else if (eax >= ride->num_vehicles && eax < (ride->num_vehicles + ride->num_stations))
else if (viewSelectionIndex >= ride->num_vehicles && viewSelectionIndex < (ride->num_vehicles + ride->num_stations))
{
StationIndex stationIndex = STATION_INDEX_NULL;
int count = eax - ride->num_vehicles;
while (count >= 0)
int32_t count = viewSelectionIndex - ride->num_vehicles;
for (const auto& station : ride->stations)
{
stationIndex++;
if (!ride->stations[stationIndex].Start.isNull())
if (!station.Start.isNull())
{
count--;
}
}
auto location = ride->stations[stationIndex].GetStart();
focus.coordinate.x = location.x;
focus.coordinate.y = location.y;
focus.coordinate.z = location.z;
focus.sprite.type |= VIEWPORT_FOCUS_TYPE_COORDINATE;
if (count == 0)
{
auto location = station.GetStart();
focus.coordinate.x = location.x;
focus.coordinate.y = location.y;
focus.coordinate.z = location.z;
focus.sprite.type |= VIEWPORT_FOCUS_TYPE_COORDINATE;
break;
}
}
}
else
{
if (eax > 0)
if (viewSelectionIndex > 0)
{
w->viewport_focus_coordinates.var_480 = 0;
}