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

Make map entrance/exit fetching functions use Coords objects

Browse Source
This commit is contained in:
Tulio Leao
2019-12-14 12:12:43 -03:00
parent 18ba9b27a3
commit 03e7e29b21
10 changed files with 28 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/openrct2/world/Map.cpp
View File

@@ -1765,9 +1765,10 @@ LargeSceneryElement* map_get_large_scenery_segment(int32_t x, int32_t y, int32_t
return nullptr;
}
EntranceElement* map_get_park_entrance_element_at(int32_t x, int32_t y, int32_t z, bool ghost)
EntranceElement* map_get_park_entrance_element_at(const CoordsXYZ& entranceCoords, bool ghost)
{
TileElement* tileElement = map_get_first_element_at(x / 32, y / 32);
auto entranceTileCoords = TileCoordsXYZ(entranceCoords);
TileElement* tileElement = map_get_first_element_at(entranceTileCoords.x, entranceTileCoords.y);
if (tileElement != nullptr)
{
do
@@ -1775,7 +1776,7 @@ EntranceElement* map_get_park_entrance_element_at(int32_t x, int32_t y, int32_t
if (tileElement->GetType() != TILE_ELEMENT_TYPE_ENTRANCE)
continue;
if (tileElement->base_height != z)
if (tileElement->base_height != entranceTileCoords.z)
continue;
if (tileElement->AsEntrance()->GetEntranceType() != ENTRANCE_TYPE_PARK_ENTRANCE)
@@ -1790,9 +1791,9 @@ EntranceElement* map_get_park_entrance_element_at(int32_t x, int32_t y, int32_t
return nullptr;
}
EntranceElement* map_get_ride_entrance_element_at(int32_t x, int32_t y, int32_t z, bool ghost)
EntranceElement* map_get_ride_entrance_element_at(const TileCoordsXYZ& entranceTileCoords, bool ghost)
{
TileElement* tileElement = map_get_first_element_at(x / 32, y / 32);
TileElement* tileElement = map_get_first_element_at(entranceTileCoords.x, entranceTileCoords.y);
if (tileElement != nullptr)
{
do
@@ -1800,7 +1801,7 @@ EntranceElement* map_get_ride_entrance_element_at(int32_t x, int32_t y, int32_t
if (tileElement->GetType() != TILE_ELEMENT_TYPE_ENTRANCE)
continue;
if (tileElement->base_height != z)
if (tileElement->base_height != entranceTileCoords.z)
continue;
if (tileElement->AsEntrance()->GetEntranceType() != ENTRANCE_TYPE_RIDE_ENTRANCE)
@@ -1815,9 +1816,9 @@ EntranceElement* map_get_ride_entrance_element_at(int32_t x, int32_t y, int32_t
return nullptr;
}
EntranceElement* map_get_ride_exit_element_at(int32_t x, int32_t y, int32_t z, bool ghost)
EntranceElement* map_get_ride_exit_element_at(const TileCoordsXYZ& exitTileCoords, bool ghost)
{
TileElement* tileElement = map_get_first_element_at(x / 32, y / 32);
TileElement* tileElement = map_get_first_element_at(exitTileCoords.x, exitTileCoords.y);
if (tileElement != nullptr)
{
do
@@ -1825,7 +1826,7 @@ EntranceElement* map_get_ride_exit_element_at(int32_t x, int32_t y, int32_t z, b
if (tileElement->GetType() != TILE_ELEMENT_TYPE_ENTRANCE)
continue;
if (tileElement->base_height != z)
if (tileElement->base_height != exitTileCoords.z)
continue;
if (tileElement->AsEntrance()->GetEntranceType() != ENTRANCE_TYPE_RIDE_EXIT)