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

Use TileElementsView for WallRemoveAction

Browse Source
This commit is contained in:
Matt
2021-02-05 17:34:05 +02:00
parent ddd67db1d2
commit 93e22d6770
1 changed files with 9 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/openrct2/actions/WallRemoveAction.cpp
View File

@@ -16,8 +16,11 @@
#include "../localisation/StringIds.h"
#include "../management/Finance.h"
#include "../world/Location.hpp"
#include "../world/TileElementsView.h"
#include "../world/Wall.h"
using namespace OpenRCT2;
WallRemoveAction::WallRemoveAction(const CoordsXYZD& loc)
: _loc(loc)
{
@@ -93,22 +96,16 @@ GameActions::Result::Ptr WallRemoveAction::Execute() const
TileElement* WallRemoveAction::GetFirstWallElementAt(const CoordsXYZD& location, bool isGhost) const
{
TileElement* tileElement = map_get_first_element_at(location);
if (!tileElement)
return nullptr;
do
for (auto* wallElement : TileElementsView<WallElement>(location))
{
if (tileElement->GetType() != TILE_ELEMENT_TYPE_WALL)
if (wallElement->GetBaseZ() != location.z)
continue;
if (tileElement->GetBaseZ() != location.z)
if (wallElement->GetDirection() != location.direction)
continue;
if (tileElement->GetDirection() != location.direction)
continue;
if (tileElement->IsGhost() != isGhost)
if (wallElement->IsGhost() != isGhost)
continue;
return tileElement;
} while (!(tileElement++)->IsLastForTile());
return wallElement->as<TileElement>();
}
return nullptr;
}