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

Remove variable and integrate logic instead

This commit is contained in:
Ted John 2016-09-10 14:40:50 +01:00
parent 2db375fb32
commit c21a047331
1 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/ride/ride.c
View File

@ -5190,14 +5190,13 @@ static void ride_scroll_to_track_error(rct_xy_element *trackElement)
*/
static rct_map_element *loc_6B4F6B(int rideIndex, int x, int y)
{
rct_map_element *mapElement;
mapElement = map_get_first_element_at(x / 32, y / 32);
rct_ride * ride = get_ride(rideIndex);
rct_map_element *mapElement = map_get_first_element_at(x / 32, y / 32);
do {
if (map_element_get_type(mapElement) != MAP_ELEMENT_TYPE_TRACK)
continue;
if (RCT2_GLOBAL(0x00F43484, uint32) & 0x80000) {
if (RideProperties[ride->type].flags & RIDE_TYPE_FLAG_FLAT_RIDE) {
if (!(FlatRideTrackSequenceProperties[mapElement->properties.track.type][0] & TRACK_SEQUENCE_FLAG_ORIGIN))
continue;
} else {
@ -5501,7 +5500,6 @@ void game_command_set_ride_status(int *eax, int *ebx, int *ecx, int *edx, int *e
*ebx = MONEY32_UNDEFINED;
return;
}
RCT2_GLOBAL(0x00F43484, uint32) = RideProperties[ride->type].flags;
if (*ebx & GAME_COMMAND_FLAG_APPLY) {
if (ride->overall_view != (uint16)-1) {