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

Merge pull request #4743 from duncanspumpkin/fix_bins

Browse Source 
Fix #4725: Filled bins incorrectly displayed
This commit is contained in:
Duncan
2016-11-02 18:30:38 +00:00
committed by GitHub
parent 1f0adb95da 6caa6d9a3f
commit cc0c552fa1
1 changed files with 13 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/paint/map_element/path.c
View File

@@ -152,7 +152,9 @@ static void path_bit_bins_paint(rct_scenery_entry* pathBitEntry, rct_map_element
if (!(mapElement->flags & MAP_ELEMENT_FLAG_BROKEN)) {
imageId -= 4;
if (!(mapElement->properties.path.addition_status & (0x3 << get_current_rotation())))
// Edges have been rotated around the rotation to check addition status
// this will also need to be rotated.
if (!(mapElement->properties.path.addition_status & ror8(0x3,(2 * get_current_rotation()))))
imageId += 8;
}
@@ -167,7 +169,9 @@ static void path_bit_bins_paint(rct_scenery_entry* pathBitEntry, rct_map_element
if (!(mapElement->flags & MAP_ELEMENT_FLAG_BROKEN)) {
imageId -= 4;
if (!(mapElement->properties.path.addition_status & rol8(0xC, get_current_rotation())))
// Edges have been rotated around the rotation to check addition status
// this will also need to be rotated.
if (!(mapElement->properties.path.addition_status & ror8(0xC, (2 * get_current_rotation()))))
imageId += 8;
}
@@ -182,8 +186,10 @@ static void path_bit_bins_paint(rct_scenery_entry* pathBitEntry, rct_map_element
if (!(mapElement->flags & MAP_ELEMENT_FLAG_BROKEN)) {
imageId -= 4;
if (!(mapElement->properties.path.addition_status & rol8(0x30, get_current_rotation())))
// Edges have been rotated around the rotation to check addition status
// this will also need to be rotated.
if (!(mapElement->properties.path.addition_status & ror8(0x30, (2 * get_current_rotation()))))
imageId += 8;
}
@@ -199,7 +205,9 @@ static void path_bit_bins_paint(rct_scenery_entry* pathBitEntry, rct_map_element
if (!(mapElement->flags & MAP_ELEMENT_FLAG_BROKEN)) {
imageId -= 4;
if (!(mapElement->properties.path.addition_status & rol8(0xC0, get_current_rotation())))
// Edges have been rotated around the rotation to check addition status
// this will also need to be rotated.
if (!(mapElement->properties.path.addition_status & ror8(0xC0, (2 * get_current_rotation()))))
imageId += 8;
}