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

Update calls to ClearAs()

This commit is contained in:
Gymnasiast 2021-12-10 22:58:27 +01:00
parent 2d1af0ec42
commit 50c0080da8
No known key found for this signature in database
GPG Key ID: DBFFF47AB2CA3EDD
6 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/openrct2/rct1/S4Importer.cpp
View File

@ -1533,7 +1533,7 @@ namespace RCT1
{
// Add a default surface element, we always need at least one element per tile
auto& dstElement = tileElements.emplace_back();
dstElement.ClearAs(TILE_ELEMENT_TYPE_SURFACE);
dstElement.ClearAs(TileElementTypeN::Surface);
dstElement.SetLastForTile(true);
}
@ -1553,7 +1553,7 @@ namespace RCT1
{
// Todo: allow for changing definition of OpenRCT2 tile element types - replace with a map
uint8_t tileElementType = src->GetType();
dst->ClearAs(tileElementType);
dst->ClearAs(static_cast<TileElementTypeN>(tileElementType >> 2));
dst->SetDirection(src->GetDirection());
// All saved in "flags"

4
src/openrct2/rct2/S6Importer.cpp
View File

@ -1167,7 +1167,7 @@ namespace RCT2
{
// Add a default surface element, we always need at least one element per tile
auto& dstElement = tileElements.emplace_back();
dstElement.ClearAs(TILE_ELEMENT_TYPE_SURFACE);
dstElement.ClearAs(TileElementTypeN::Surface);
dstElement.SetLastForTile(true);
}
@ -1185,7 +1185,7 @@ namespace RCT2
{
// Todo: allow for changing definition of OpenRCT2 tile element types - replace with a map
uint8_t tileElementType = src->GetType();
dst->ClearAs(tileElementType);
dst->ClearAs(static_cast<TileElementTypeN>(tileElementType >> 2));
dst->SetDirection(src->GetDirection());
dst->SetBaseZ(src->base_height * COORDS_Z_STEP);
dst->SetClearanceZ(src->clearance_height * COORDS_Z_STEP);

2
src/openrct2/ride/TrackDesign.cpp
View File

@ -2160,7 +2160,7 @@ static void TrackDesignPreviewClearMap()
for (int32_t i = 0; i < numTiles; i++)
{
auto* element = &tileElements.emplace_back();
element->ClearAs(TILE_ELEMENT_TYPE_SURFACE);
element->ClearAs(TileElementTypeN::Surface);
element->SetLastForTile(true);
element->AsSurface()->SetSlope(TILE_ELEMENT_SLOPE_FLAT);
element->AsSurface()->SetWaterHeight(0);

4
src/openrct2/world/Map.cpp
View File

@ -154,7 +154,7 @@ void SetTileElements(std::vector<TileElement>&& tileElements)
static TileElement GetDefaultSurfaceElement()
{
TileElement el;
el.ClearAs(TILE_ELEMENT_TYPE_SURFACE);
el.ClearAs(TileElementTypeN::Surface);
el.SetLastForTile(true);
el.base_height = 14;
el.clearance_height = 14;
@ -433,7 +433,7 @@ void map_init(int32_t size)
for (int32_t i = 0; i < numTiles; i++)
{
auto* element = &tileElements[i];
element->ClearAs(TILE_ELEMENT_TYPE_SURFACE);
element->ClearAs(TileElementTypeN::Surface);
element->SetLastForTile(true);
element->base_height = 14;
element->clearance_height = 14;

5
src/openrct2/world/TileElement.cpp
View File

@ -101,9 +101,10 @@ ride_id_t TileElement::GetRideIndex() const
}
}
void TileElement::ClearAs(uint8_t newType)
void TileElement::ClearAs(TileElementTypeN newType)
{
type = newType;
type = 0;
SetTypeN(newType);
Flags = 0;
base_height = MINIMUM_LAND_HEIGHT;
clearance_height = MINIMUM_LAND_HEIGHT;

2
src/openrct2/world/TileElement.h
View File

@ -199,7 +199,7 @@ struct TileElement : public TileElementBase
uint8_t pad_05[3];
uint8_t pad_08[8];
void ClearAs(uint8_t newType);
void ClearAs(TileElementTypeN newType);
ride_id_t GetRideIndex() const;