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

Revert #3104. Fix #3100

This commit is contained in:
duncanspumpkin 2016-03-07 19:04:48 +00:00
parent 86206d83c5
commit ff6bfdced3
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/ride/ride.c
View File

@ -7795,7 +7795,7 @@ void sub_6CB945(int rideIndex)
} }
mapElement->properties.entrance.index &= 0x8F; mapElement->properties.entrance.index &= 0x8F;
mapElement->properties.entrance.index |= stationId; mapElement->properties.entrance.index |= stationId << 4;
shouldRemove = false; shouldRemove = false;
} while (!map_element_is_last_for_tile(trackElement++)); } while (!map_element_is_last_for_tile(trackElement++));

3
src/world/footpath.c
View File

@ -52,7 +52,8 @@ static const uint16 EntranceDirections[] = {
static int entrance_get_directions(rct_map_element *mapElement) static int entrance_get_directions(rct_map_element *mapElement)
{ {
uint8 entranceType = mapElement->properties.entrance.type; uint8 entranceType = mapElement->properties.entrance.type;
return EntranceDirections[(entranceType * 8)]; uint8 sequence = mapElement->properties.entrance.index & 0x0F;
return EntranceDirections[(entranceType * 8) + sequence];
} }
static bool entrance_has_direction(rct_map_element *mapElement, int direction) static bool entrance_has_direction(rct_map_element *mapElement, int direction)