mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-01-27 16:54:52 +01:00
Code Issues Releases Wiki Activity

Refactor LargeSceneryEntry and remove rct_scenery_entry (#14816)

Browse Source
This commit is contained in:
Duncan
2021-06-04 12:41:23 +01:00
committed by GitHub
parent 12c5484f44
commit c34079acee
27 changed files with 153 additions and 170 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/openrct2/ride/TrackDesignSave.cpp
View File

@@ -126,7 +126,6 @@ bool track_design_save_contains_tile_element(const TileElement* tileElement)
static int32_t tile_element_get_total_element_count(TileElement* tileElement)
{
int32_t elementCount;
rct_scenery_entry* sceneryEntry;
rct_large_scenery_tile* tile;
switch (tileElement->GetType())
@@ -137,8 +136,9 @@ static int32_t tile_element_get_total_element_count(TileElement* tileElement)
return 1;
case TILE_ELEMENT_TYPE_LARGE_SCENERY:
sceneryEntry = tileElement->AsLargeScenery()->GetEntry();
tile = sceneryEntry->large_scenery.tiles;
{
auto* sceneryEntry = tileElement->AsLargeScenery()->GetEntry();
tile = sceneryEntry->tiles;
elementCount = 0;
do
{
@@ -146,7 +146,7 @@ static int32_t tile_element_get_total_element_count(TileElement* tileElement)
elementCount++;
} while (tile->x_offset != static_cast<int16_t>(static_cast<uint16_t>(0xFFFF)));
return elementCount;
}
default:
return 0;
}
@@ -238,7 +238,7 @@ static void track_design_save_add_large_scenery(const CoordsXY& loc, LargeScener
int32_t entryType = tileElement->GetEntryIndex();
auto entry = object_entry_get_object(ObjectType::LargeScenery, entryType);
sceneryTiles = get_large_scenery_entry(entryType)->large_scenery.tiles;
sceneryTiles = get_large_scenery_entry(entryType)->tiles;
int32_t z = tileElement->base_height;
direction = tileElement->GetDirection();
@@ -423,7 +423,7 @@ static void track_design_save_remove_large_scenery(const CoordsXY& loc, LargeSce
int32_t entryType = tileElement->GetEntryIndex();
auto entry = object_entry_get_object(ObjectType::LargeScenery, entryType);
sceneryTiles = get_large_scenery_entry(entryType)->large_scenery.tiles;
sceneryTiles = get_large_scenery_entry(entryType)->tiles;
int32_t z = tileElement->base_height;
direction = tileElement->GetDirection();