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

Merge pull request #15133 from SaadRehmanCS/bug-branch 

Fix #14918 refactor while loop and int variable size
This commit is contained in:
ζeh Matt 2021-07-31 12:10:30 -07:00 committed by GitHub
parent 6b94e81622 0df5d3cdf2
commit c0eade9c88
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 19 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
contributors.md
View File

@ -174,6 +174,7 @@ The following people are not part of the development team, but have been contrib
* Daniel Karandikar (DKarandikar) * Daniel Karandikar (DKarandikar)
* Struan Clark (xtruan) * Struan Clark (xtruan)
* Kane Shaw (seifer7) * Kane Shaw (seifer7)
* Saad Rehman (SaadRehmanCS)
## Toolchain ## Toolchain
* (Balletie) - macOS * (Balletie) - macOS

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

@ -1559,7 +1559,7 @@ static void window_ride_init_viewport(rct_window* w)
if (ride == nullptr) if (ride == nullptr)
return; return;
int32_t eax = w->viewport_focus_coordinates.var_480 - 1; int32_t viewSelectionIndex = w->viewport_focus_coordinates.var_480 - 1;
union union
{ {
@ -1576,10 +1576,9 @@ static void window_ride_init_viewport(rct_window* w)
focus.coordinate.width = 0; focus.coordinate.width = 0;
focus.coordinate.height = 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(); rct_ride_entry* ride_entry = ride->GetRideEntry();
if (ride_entry && ride_entry->tab_vehicle != 0) if (ride_entry && ride_entry->tab_vehicle != 0)
{ {
@ -1598,32 +1597,32 @@ static void window_ride_init_viewport(rct_window* w)
focus.sprite.type |= VIEWPORT_FOCUS_TYPE_SPRITE; 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; int32_t count = viewSelectionIndex - ride->num_vehicles;
int32_t count = eax - ride->num_vehicles; for (const auto& station : ride->stations)
do
{ {
stationIndex++; if (!station.Start.isNull())
if (!ride->stations[stationIndex].Start.isNull())
{ {
count--; count--;
} }
} while (count >= 0); if (count == 0)
{
auto location = ride->stations[stationIndex].GetStart(); auto location = station.GetStart();
focus.coordinate.x = location.x; focus.coordinate.x = location.x;
focus.coordinate.y = location.y; focus.coordinate.y = location.y;
focus.coordinate.z = location.z; focus.coordinate.z = location.z;
focus.sprite.type |= VIEWPORT_FOCUS_TYPE_COORDINATE; focus.sprite.type |= VIEWPORT_FOCUS_TYPE_COORDINATE;
break;
}
}
} }
else else
{ {
if (eax > 0) if (viewSelectionIndex > 0)
{ {
w->viewport_focus_coordinates.var_480 = 0; w->viewport_focus_coordinates.var_480 = 0;
} }
if (w->number < ride_overall_views.size()) if (w->number < ride_overall_views.size())
{ {
const auto& view = ride_overall_views[w->number]; const auto& view = ride_overall_views[w->number];