mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-01-15 19:13:07 +01:00
Code Issues Releases Wiki Activity

Apply suggested corrections

Browse Source
This commit is contained in:
Marijn van der Werf
2016-05-18 23:31:37 +02:00
parent a32aad2274
commit a550e2e3b1
2 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/ride/track_paint.c
View File

@@ -152,7 +152,7 @@ bool track_paint_util_has_fence(enum edge edge, rct_xy16 position, rct_map_eleme
((position.x / 32) + offset.x) |
(((position.y / 32) + offset.y) << 8);
uint8 entranceId = (mapElement->properties.track.sequence & 0x70) >> 4;
int entranceId = map_get_station(mapElement);
return (ride->entrances[entranceId] != entranceLoc && ride->exits[entranceId] != entranceLoc);
}

10
src/ride/transport/chairlift.c
View File

@@ -111,9 +111,13 @@ static void chairlift_paint_util_draw_supports(int segments, uint16 height)
}
}
rct_map_element * map_get_track_element_at_from_ride_fuzzy(int x, int y, int z, int rideIndex)
rct_map_element * chairlift_paint_util_map_get_track_element_at_from_ride_fuzzy(int x, int y, int z, int rideIndex)
{
rct_map_element * mapElement = map_get_first_element_at(x >> 5, y >> 5);
if (mapElement == NULL) {
return NULL;
}
do {
if (map_element_get_type(mapElement) != MAP_ELEMENT_TYPE_TRACK) continue;
if (mapElement->properties.track.ride_index != rideIndex) continue;
@@ -137,7 +141,7 @@ static bool chairlift_paint_util_is_first_track(uint8 rideIndex, const rct_map_e
.y = pos.y - delta.y,
};
rct_map_element * nextTrack = map_get_track_element_at_from_ride_fuzzy(newPos.x, newPos.y, mapElement->base_height, rideIndex);
rct_map_element * nextTrack = chairlift_paint_util_map_get_track_element_at_from_ride_fuzzy(newPos.x, newPos.y, mapElement->base_height, rideIndex);
return nextTrack == NULL;
}
@@ -154,7 +158,7 @@ static bool chairlift_paint_util_is_last_track(uint8 rideIndex, const rct_map_el
.y = pos.y + delta.y,
};
rct_map_element * nextTrack = map_get_track_element_at_from_ride_fuzzy(newPos.x, newPos.y, mapElement->base_height, rideIndex);
rct_map_element * nextTrack = chairlift_paint_util_map_get_track_element_at_from_ride_fuzzy(newPos.x, newPos.y, mapElement->base_height, rideIndex);
return nextTrack == NULL;
}