mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2025-12-24 08:12:53 +01:00
Code Issues Releases Wiki Activity

Mark map element getters const

Browse Source 
While it doesn't change a lot in terms of performance, it helps out
compiler being a bit smarter about inlining and reordering things (as
evidenced by generated assembly).
This commit is contained in:
Michał Janiszewski
2016-02-23 15:11:16 +01:00
parent fe7c99e256
commit d375015975
3 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/interface/viewport.c
View File

@@ -1801,7 +1801,7 @@ static void sub_68B3FB(int x, int y)
if (bx <= dpi->y)
return;
rct_map_element* element = map_element;//push map_element
const rct_map_element* element = map_element;//push map_element
sint16 max_height = 0;
do{

10
src/world/map.c
View File

@@ -181,22 +181,22 @@ void map_set_tile_elements(int x, int y, rct_map_element *elements)
TILE_MAP_ELEMENT_POINTER(x + y * 256) = elements;
}
int map_element_is_last_for_tile(rct_map_element *element)
int map_element_is_last_for_tile(const rct_map_element *element)
{
return element->flags & MAP_ELEMENT_FLAG_LAST_TILE;
}
int map_element_get_type(rct_map_element *element)
int map_element_get_type(const rct_map_element *element)
{
return element->type & MAP_ELEMENT_TYPE_MASK;
}
int map_element_get_direction(rct_map_element *element)
int map_element_get_direction(const rct_map_element *element)
{
return element->type & MAP_ELEMENT_DIRECTION_MASK;
}
int map_element_get_terrain(rct_map_element *element)
int map_element_get_terrain(const rct_map_element *element)
{
int terrain = (element->properties.surface.terrain >> 5) & 7;
if (element->type & 1)
@@ -204,7 +204,7 @@ int map_element_get_terrain(rct_map_element *element)
return terrain;
}
int map_element_get_terrain_edge(rct_map_element *element)
int map_element_get_terrain_edge(const rct_map_element *element)
{
int terrain_edge = (element->properties.surface.slope >> 5) & 7;
if (element->type & 128)

10
src/world/map.h
View File

@@ -287,11 +287,11 @@ void map_init(int size);
void map_update_tile_pointers();
rct_map_element *map_get_first_element_at(int x, int y);
void map_set_tile_elements(int x, int y, rct_map_element *elements);
int map_element_is_last_for_tile(rct_map_element *element);
int map_element_get_type(rct_map_element *element);
int map_element_get_direction(rct_map_element *element);
int map_element_get_terrain(rct_map_element *element);
int map_element_get_terrain_edge(rct_map_element *element);
int map_element_is_last_for_tile(const rct_map_element *element);
int map_element_get_type(const rct_map_element *element);
int map_element_get_direction(const rct_map_element *element);
int map_element_get_terrain(const rct_map_element *element);
int map_element_get_terrain_edge(const rct_map_element *element);
void map_element_set_terrain(rct_map_element *element, int terrain);
void map_element_set_terrain_edge(rct_map_element *element, int terrain);
int map_height_from_slope(int x, int y, int slope);