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

Add an assert for getting proper mapElementType

This commit is contained in:
Michał Janiszewski 2015-12-26 13:12:45 +01:00
parent de52321026
commit 79e5bb758d
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/windows/map.c
View File

@ -1546,9 +1546,10 @@ static uint16 map_window_get_pixel_colour_peep(int x, int y)
colour = 10 | (colour & 0xFF00);
while (!map_element_is_last_for_tile(mapElement++)) {
int mapElementType = map_element_get_type(mapElement);
colour &= ElementTypeMaskColour[mapElementType >> 2];
colour |= ElementTypeAddColour[mapElementType >> 2];
int mapElementType = map_element_get_type(mapElement) >> 2;
assert(mapElementType < countof(ElementTypeMaskColour));
colour &= ElementTypeMaskColour[mapElementType];
colour |= ElementTypeAddColour[mapElementType];
}
return colour;