From 46b3687a2d2008c3adb8a5f2b91df38620805686 Mon Sep 17 00:00:00 2001 From: underdoom <108634630+underdoom@users.noreply.github.com> Date: Mon, 4 Jul 2022 22:59:09 +0300 Subject: [PATCH] Simplify tile element initialisation --- src/openrct2/world/Map.cpp | 20 +------------------- 1 file changed, 1 insertion(+), 19 deletions(-) diff --git a/src/openrct2/world/Map.cpp b/src/openrct2/world/Map.cpp index 78534fdd55..0ec7559686 100644 --- a/src/openrct2/world/Map.cpp +++ b/src/openrct2/world/Map.cpp @@ -422,25 +422,7 @@ BannerElement* map_get_banner_element_at(const CoordsXYZ& bannerPos, uint8_t pos void map_init(const TileCoordsXY& size) { auto numTiles = MAXIMUM_MAP_SIZE_TECHNICAL * MAXIMUM_MAP_SIZE_TECHNICAL; - - std::vector tileElements; - tileElements.resize(numTiles); - for (int32_t i = 0; i < numTiles; i++) - { - auto* element = &tileElements[i]; - element->ClearAs(TileElementType::Surface); - element->SetLastForTile(true); - element->base_height = 14; - element->clearance_height = 14; - element->AsSurface()->SetWaterHeight(0); - element->AsSurface()->SetSlope(TILE_ELEMENT_SLOPE_FLAT); - element->AsSurface()->SetGrassLength(GRASS_LENGTH_CLEAR_0); - element->AsSurface()->SetOwnership(OWNERSHIP_UNOWNED); - element->AsSurface()->SetParkFences(0); - element->AsSurface()->SetSurfaceStyle(0); - element->AsSurface()->SetEdgeStyle(0); - } - SetTileElements(std::move(tileElements)); + SetTileElements(std::vector(numTiles, GetDefaultSurfaceElement())); gGrassSceneryTileLoopPosition = 0; gWidePathTileLoopPosition = {};