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

Make Map::check_max_allowable_land_rights_for_tile() receive CoordsXYZ (#10433)

This commit is contained in:
Tulio Leao 2019-12-23 13:24:41 -03:00 committed by Michael Steenbeek
parent c169a92f1f
commit 27866e992d
4 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/openrct2/actions/SetCheatAction.hpp
View File

@ -745,7 +745,7 @@ private:
continue;
int32_t base_z = surfaceElement->base_height;
int32_t destOwnership = check_max_allowable_land_rights_for_tile(coords.x >> 5, coords.y >> 5, base_z);
int32_t destOwnership = check_max_allowable_land_rights_for_tile({ coords, base_z << 3 });
// only own tiles that were not set to 0
if (destOwnership != OWNERSHIP_UNOWNED)

2
src/openrct2/world/Footpath.cpp
View File

@ -1236,7 +1236,7 @@ static void footpath_fix_ownership(int32_t x, int32_t y)
if (surfaceElement != nullptr)
{
// If the tile is not safe to own construction rights of, erase them.
if (check_max_allowable_land_rights_for_tile(x >> 5, y >> 5, surfaceElement->base_height) == OWNERSHIP_UNOWNED)
if (check_max_allowable_land_rights_for_tile({ x, y, surfaceElement->base_height << 3 }) == OWNERSHIP_UNOWNED)
{
ownership = OWNERSHIP_UNOWNED;
}

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

@ -2355,9 +2355,9 @@ WallElement* map_get_wall_element_at(CoordsXYZD wallCoords)
return nullptr;
}
uint16_t check_max_allowable_land_rights_for_tile(uint8_t x, uint8_t y, uint8_t base_z)
uint16_t check_max_allowable_land_rights_for_tile(const CoordsXYZ& tileMapPos)
{
TileElement* tileElement = map_get_first_element_at(TileCoordsXY{ x, y }.ToCoordsXY());
TileElement* tileElement = map_get_first_element_at(tileMapPos);
uint16_t destOwnership = OWNERSHIP_OWNED;
// Sometimes done deliberately.
@ -2366,6 +2366,7 @@ uint16_t check_max_allowable_land_rights_for_tile(uint8_t x, uint8_t y, uint8_t
return OWNERSHIP_OWNED;
}
auto tilePos = TileCoordsXYZ{ tileMapPos };
do
{
int32_t type = tileElement->GetType();
@ -2375,7 +2376,7 @@ uint16_t check_max_allowable_land_rights_for_tile(uint8_t x, uint8_t y, uint8_t
{
destOwnership = OWNERSHIP_CONSTRUCTION_RIGHTS_OWNED;
// Do not own construction rights if too high/below surface
if (tileElement->base_height - 3 > base_z || tileElement->base_height < base_z)
if (tileElement->base_height - 3 > tilePos.z || tileElement->base_height < tilePos.z)
{
destOwnership = OWNERSHIP_UNOWNED;
break;

2
src/openrct2/world/Map.h
View File

@ -243,7 +243,7 @@ TileElement* map_get_track_element_at_with_direction_from_ride(
bool map_is_location_at_edge(const CoordsXY& loc);
void map_obstruction_set_error_text(TileElement* tileElement);
uint16_t check_max_allowable_land_rights_for_tile(uint8_t x, uint8_t y, uint8_t base_z);
uint16_t check_max_allowable_land_rights_for_tile(const CoordsXYZ& tileMapPos);
void FixLandOwnershipTiles(std::initializer_list<TileCoordsXY> tiles);
void FixLandOwnershipTilesWithOwnership(std::initializer_list<TileCoordsXY> tiles, uint8_t ownership);