mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-01-30 10:15:36 +01:00
Code Issues Releases Wiki Activity

Drop the N postfix

Browse Source
This commit is contained in:
Gymnasiast
2021-12-11 00:39:39 +01:00
parent 23c5988fb1
commit aa34f0f760
54 changed files with 562 additions and 563 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
src/openrct2/world/MapAnimation.cpp
View File

@@ -98,7 +98,7 @@ static bool map_animation_invalidate_ride_entrance(const CoordsXYZ& loc)
{
if (tileElement->base_height != tileLoc.z)
continue;
if (tileElement->GetTypeN() != TileElementTypeN::Entrance)
if (tileElement->GetType() != TileElementType::Entrance)
continue;
if (tileElement->AsEntrance()->GetEntranceType() != ENTRANCE_TYPE_RIDE_ENTRANCE)
continue;
@@ -135,7 +135,7 @@ static bool map_animation_invalidate_queue_banner(const CoordsXYZ& loc)
{
if (tileElement->base_height != tileLoc.z)
continue;
if (tileElement->GetTypeN() != TileElementTypeN::Path)
if (tileElement->GetType() != TileElementType::Path)
continue;
if (!(tileElement->AsPath()->IsQueue()))
continue;
@@ -168,7 +168,7 @@ static bool map_animation_invalidate_small_scenery(const CoordsXYZ& loc)
{
if (tileElement->base_height != tileLoc.z)
continue;
if (tileElement->GetTypeN() != TileElementTypeN::SmallScenery)
if (tileElement->GetType() != TileElementType::SmallScenery)
continue;
if (tileElement->IsGhost())
continue;
@@ -233,7 +233,7 @@ static bool map_animation_invalidate_park_entrance(const CoordsXYZ& loc)
{
if (tileElement->base_height != tileLoc.z)
continue;
if (tileElement->GetTypeN() != TileElementTypeN::Entrance)
if (tileElement->GetType() != TileElementType::Entrance)
continue;
if (tileElement->AsEntrance()->GetEntranceType() != ENTRANCE_TYPE_PARK_ENTRANCE)
continue;
@@ -263,7 +263,7 @@ static bool map_animation_invalidate_track_waterfall(const CoordsXYZ& loc)
{
if (tileElement->base_height != tileLoc.z)
continue;
if (tileElement->GetTypeN() != TileElementTypeN::Track)
if (tileElement->GetType() != TileElementType::Track)
continue;
if (tileElement->AsTrack()->GetTrackType() == TrackElemType::Waterfall)
@@ -292,7 +292,7 @@ static bool map_animation_invalidate_track_rapids(const CoordsXYZ& loc)
{
if (tileElement->base_height != tileLoc.z)
continue;
if (tileElement->GetTypeN() != TileElementTypeN::Track)
if (tileElement->GetType() != TileElementType::Track)
continue;
if (tileElement->AsTrack()->GetTrackType() == TrackElemType::Rapids)
@@ -321,7 +321,7 @@ static bool map_animation_invalidate_track_onridephoto(const CoordsXYZ& loc)
{
if (tileElement->base_height != tileLoc.z)
continue;
if (tileElement->GetTypeN() != TileElementTypeN::Track)
if (tileElement->GetType() != TileElementType::Track)
continue;
if (tileElement->AsTrack()->GetTrackType() == TrackElemType::OnRidePhoto)
@@ -360,7 +360,7 @@ static bool map_animation_invalidate_track_whirlpool(const CoordsXYZ& loc)
{
if (tileElement->base_height != tileLoc.z)
continue;
if (tileElement->GetTypeN() != TileElementTypeN::Track)
if (tileElement->GetType() != TileElementType::Track)
continue;
if (tileElement->AsTrack()->GetTrackType() == TrackElemType::Whirlpool)
@@ -389,7 +389,7 @@ static bool map_animation_invalidate_track_spinningtunnel(const CoordsXYZ& loc)
{
if (tileElement->base_height != tileLoc.z)
continue;
if (tileElement->GetTypeN() != TileElementTypeN::Track)
if (tileElement->GetType() != TileElementType::Track)
continue;
if (tileElement->AsTrack()->GetTrackType() == TrackElemType::SpinningTunnel)
@@ -427,7 +427,7 @@ static bool map_animation_invalidate_banner(const CoordsXYZ& loc)
{
if (tileElement->base_height != tileLoc.z)
continue;
if (tileElement->GetTypeN() != TileElementTypeN::Banner)
if (tileElement->GetType() != TileElementType::Banner)
continue;
map_invalidate_tile_zoom1({ loc, loc.z, loc.z + 16 });
return false;
@@ -453,7 +453,7 @@ static bool map_animation_invalidate_large_scenery(const CoordsXYZ& loc)
{
if (tileElement->base_height != tileLoc.z)
continue;
if (tileElement->GetTypeN() != TileElementTypeN::LargeScenery)
if (tileElement->GetType() != TileElementType::LargeScenery)
continue;
auto* sceneryEntry = tileElement->AsLargeScenery()->GetEntry();
@@ -487,7 +487,7 @@ static bool map_animation_invalidate_wall_door(const CoordsXYZ& loc)
{
if (tileElement->base_height != tileLoc.z)
continue;
if (tileElement->GetTypeN() != TileElementTypeN::Wall)
if (tileElement->GetType() != TileElementType::Wall)
continue;
auto* wallEntry = tileElement->AsWall()->GetEntry();
@@ -548,7 +548,7 @@ static bool map_animation_invalidate_wall(const CoordsXYZ& loc)
{
if (tileElement->base_height != tileLoc.z)
continue;
if (tileElement->GetTypeN() != TileElementTypeN::Wall)
if (tileElement->GetType() != TileElementType::Wall)
continue;
auto* wallEntry = tileElement->AsWall()->GetEntry();
@@ -617,12 +617,12 @@ void AutoCreateMapAnimations()
{
auto el = it.element;
auto loc = CoordsXYZ{ TileCoordsXY(it.x, it.y).ToCoordsXY(), el->GetBaseZ() };
switch (el->GetTypeN())
switch (el->GetType())
{
case TileElementTypeN::Banner:
case TileElementType::Banner:
map_animation_create(MAP_ANIMATION_TYPE_BANNER, loc);
break;
case TileElementTypeN::Wall:
case TileElementType::Wall:
{
auto wallEl = el->AsWall();
auto* entry = wallEl->GetEntry();
@@ -633,7 +633,7 @@ void AutoCreateMapAnimations()
}
break;
}
case TileElementTypeN::SmallScenery:
case TileElementType::SmallScenery:
{
auto sceneryEl = el->AsSmallScenery();
auto* sceneryEntry = sceneryEl->GetEntry();
@@ -643,7 +643,7 @@ void AutoCreateMapAnimations()
}
break;
}
case TileElementTypeN::LargeScenery:
case TileElementType::LargeScenery:
{
auto sceneryEl = el->AsLargeScenery();
auto entry = sceneryEl->GetEntry();
@@ -653,7 +653,7 @@ void AutoCreateMapAnimations()
}
break;
}
case TileElementTypeN::Path:
case TileElementType::Path:
{
auto path = el->AsPath();
if (path->HasQueueBanner())
@@ -662,7 +662,7 @@ void AutoCreateMapAnimations()
}
break;
}
case TileElementTypeN::Entrance:
case TileElementType::Entrance:
{
auto entrance = el->AsEntrance();
switch (entrance->GetEntranceType())
@@ -679,7 +679,7 @@ void AutoCreateMapAnimations()
}
break;
}
case TileElementTypeN::Track:
case TileElementType::Track:
{
auto track = el->AsTrack();
switch (track->GetTrackType())
@@ -699,7 +699,7 @@ void AutoCreateMapAnimations()
}
break;
}
case TileElementTypeN::Surface:
case TileElementType::Surface:
break;
}
}