From 9dde45fb05f9f0152ee5572035ebc81390906689 Mon Sep 17 00:00:00 2001 From: Matt Date: Fri, 5 Feb 2021 17:39:25 +0200 Subject: [PATCH] Use TileElementsView for virtual floor --- src/openrct2/paint/VirtualFloor.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/openrct2/paint/VirtualFloor.cpp b/src/openrct2/paint/VirtualFloor.cpp index a3ce081a3d..0a97801a7c 100644 --- a/src/openrct2/paint/VirtualFloor.cpp +++ b/src/openrct2/paint/VirtualFloor.cpp @@ -17,6 +17,7 @@ #include "../util/Util.h" #include "../world/Location.hpp" #include "../world/Map.h" +#include "../world/TileElementsView.h" #include "Paint.h" #include "VirtualFloor.h" #include "tile_element/Paint.TileElement.h" @@ -24,6 +25,8 @@ #include #include +using namespace OpenRCT2; + static uint16_t _virtualFloorBaseSize = 5 * 32; static uint16_t _virtualFloorHeight = 0; static CoordsXYZ _virtualFloorLastMinPos; @@ -241,10 +244,7 @@ static void virtual_floor_get_tile_properties( // * Surfaces, which may put us underground // * Walls / banners, which are displayed as occupied edges // * Ghost objects, which are displayed as lit squares - TileElement* tileElement = map_get_first_element_at(loc); - if (tileElement == nullptr) - return; - do + for (auto* tileElement : TileElementsView(loc)) { int32_t elementType = tileElement->GetType(); @@ -285,7 +285,7 @@ static void virtual_floor_get_tile_properties( } *outOccupied = true; - } while (!(tileElement++)->IsLastForTile()); + } } void virtual_floor_paint(paint_session* session)