mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-01-22 06:23:04 +01:00
Code Issues Releases Wiki Activity

add global macro: gNextFreeMapElement

Browse Source
This commit is contained in:
Ted John
2016-04-24 14:30:21 +01:00
parent 0f6e64ac76
commit d18ea8570d
5 changed files with 27 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/rct1/S4Importer.cpp
View File

@@ -1095,7 +1095,7 @@ void S4Importer::ClearExtraTileEntries()
*tilePointer++ = nextFreeMapElement++;
}
RCT2_GLOBAL(RCT2_ADDRESS_NEXT_FREE_MAP_ELEMENT, rct_map_element*) = nextFreeMapElement;
gNextFreeMapElement = nextFreeMapElement;
}
void S4Importer::FixColours()
@@ -1128,7 +1128,7 @@ void S4Importer::FixColours()
// }
rct_map_element * mapElement = gMapElements;
while (mapElement < RCT2_GLOBAL(RCT2_ADDRESS_NEXT_FREE_MAP_ELEMENT, rct_map_element*))
while (mapElement < gNextFreeMapElement)
{
if (mapElement->base_height != 255)
{
@@ -1188,7 +1188,7 @@ void S4Importer::FixZ()
// }
rct_map_element * mapElement = gMapElements;
while (mapElement < RCT2_GLOBAL(RCT2_ADDRESS_NEXT_FREE_MAP_ELEMENT, rct_map_element*))
while (mapElement < gNextFreeMapElement)
{
if (mapElement->base_height != 255)
{
@@ -1203,7 +1203,7 @@ void S4Importer::FixZ()
void S4Importer::FixPaths()
{
rct_map_element * mapElement = gMapElements;
while (mapElement < RCT2_GLOBAL(RCT2_ADDRESS_NEXT_FREE_MAP_ELEMENT, rct_map_element*))
while (mapElement < gNextFreeMapElement)
{
switch (map_element_get_type(mapElement)) {
case MAP_ELEMENT_TYPE_PATH: