mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-01-16 11:33:03 +01:00
Code Issues Releases Wiki Activity

Make map element arrays static

Browse Source
This commit is contained in:
Michał Janiszewski
2016-06-16 22:42:05 +02:00
parent c2bf4b75e7
commit 78e2aec5fe
2 changed files with 7 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/world/map.c
View File

@@ -62,8 +62,8 @@ uint8 gMapSelectArrowDirection;
uint8 gMapGroundFlags;
#if defined(NO_RCT2)
rct_map_element *gMapElements = NULL;
rct_map_element **gMapElementTilePointers = NULL;
rct_map_element gMapElements[MAX_MAP_ELEMENTS];
rct_map_element *gMapElementTilePointers[MAX_TILE_MAP_ELEMENT_POINTERS];
#else
rct_map_element *gMapElements = (rct_map_element*)RCT2_ADDRESS_MAP_ELEMENTS;
rct_map_element **gMapElementTilePointers = (rct_map_element**)RCT2_ADDRESS_TILE_MAP_ELEMENT_POINTERS;
@@ -327,12 +327,6 @@ void map_init(int size)
rct_map_element *map_element;
#if defined(NO_RCT2)
if (gMapElements == NULL) {
gMapElements = malloc(sizeof(rct_map_element) * MAX_MAP_ELEMENTS);
// TODO: free this pointer
}
#endif
date_reset();
gNumMapAnimations = 0;
RCT2_GLOBAL(0x010E63B8, sint32) = 0;
@@ -360,12 +354,6 @@ void map_init(int size)
gMapSize = size;
gMapSizeMaxXY = size * 32 - 33;
RCT2_GLOBAL(0x01359208, sint16) = 7;
#if defined(NO_RCT2)
if (gMapElementTilePointers == NULL) {
gMapElementTilePointers = malloc(sizeof(rct_map_element*) * MAX_TILE_MAP_ELEMENT_POINTERS);
// TODO: free this pointer
}
#endif
map_update_tile_pointers();
map_remove_out_of_range_elements();
climate_reset(CLIMATE_WARM);

5
src/world/map.h
View File

@@ -333,8 +333,13 @@ extern uint8 gMapSelectArrowDirection;
extern uint8 gMapGroundFlags;
#ifdef NO_RCT2
extern rct_map_element gMapElements[];
extern rct_map_element *gMapElementTilePointers[];
#else
extern rct_map_element *gMapElements;
extern rct_map_element **gMapElementTilePointers;
#endif
extern rct_xy16 *gMapSelectionTiles;
extern rct2_peep_spawn *gPeepSpawns;