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

Fix bugs in park fences

This commit is contained in:
Gymnasiast 2018-09-16 21:53:12 +02:00
parent 0235137010
commit d1b576b4a5
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/openrct2/interface/InteractiveConsole.cpp
View File

@ -1146,7 +1146,7 @@ static int32_t cc_remove_park_fences(
if (it.element->GetType() == TILE_ELEMENT_TYPE_SURFACE)
{
// Remove all park fence flags
it.element->AsSurface()->SetOwnership(it.element->AsSurface()->GetOwnership());
it.element->AsSurface()->SetParkFences(0);
}
} while (tile_element_iterator_next(&it));

14
src/openrct2/world/Park.cpp
View File

@ -173,7 +173,7 @@ void update_park_fences(const CoordsXY coords)
if (surfaceElement == nullptr)
return;
uint8_t newOwnership = surfaceElement->AsSurface()->GetOwnership();
uint8_t newFences = 0;
if ((surfaceElement->AsSurface()->GetOwnership() & OWNERSHIP_OWNED) == 0)
{
bool fenceRequired = true;
@ -202,34 +202,34 @@ void update_park_fences(const CoordsXY coords)
rct_string_id previous_error = gGameCommandErrorText;
if (map_is_location_in_park({ coords.x - 32, coords.y }))
{
newOwnership |= 0x8;
newFences |= 0x8;
}
if (map_is_location_in_park({ coords.x, coords.y - 32 }))
{
newOwnership |= 0x4;
newFences |= 0x4;
}
if (map_is_location_in_park({ coords.x + 32, coords.y }))
{
newOwnership |= 0x2;
newFences |= 0x2;
}
if (map_is_location_in_park({ coords.x, coords.y + 32 }))
{
newOwnership |= 0x1;
newFences |= 0x1;
}
gGameCommandErrorText = previous_error;
}
}
if (surfaceElement->AsSurface()->GetOwnership() != newOwnership)
if (surfaceElement->AsSurface()->GetParkFences() != newFences)
{
int32_t z0 = surfaceElement->base_height * 8;
int32_t z1 = z0 + 16;
map_invalidate_tile(coords.x, coords.y, z0, z1);
surfaceElement->AsSurface()->SetOwnership(newOwnership);
surfaceElement->AsSurface()->SetParkFences(newFences);
}
}