mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-01-04 13:42:55 +01:00
Code Issues Releases Wiki Activity

Close #13047: De-duplicate track type normalisation in TrackRemoveAction

Browse Source 
Co-authored-by: Gymnasiast <Gymnasiast@users.noreply.github.com>
This commit is contained in:
shakthi124
2024-05-29 13:54:41 -07:00
committed by GitHub
parent 73043106ed
commit 7fb3022f32
1 changed files with 16 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

50
src/openrct2/actions/TrackRemoveAction.cpp
View File

@@ -43,6 +43,18 @@ uint16_t TrackRemoveAction::GetActionFlags() const
return GameAction::GetActionFlags();
}
static int32_t normaliseTrackType(int32_t trackType)
{
switch (trackType)
{
case TrackElemType::BeginStation:
case TrackElemType::MiddleStation:
return TrackElemType::EndStation;
}
return trackType;
}
void TrackRemoveAction::Serialise(DataSerialiser& stream)
{
GameAction::Serialise(stream);
@@ -58,15 +70,7 @@ GameActions::Result TrackRemoveAction::Query() const
res.Position.z = _origin.z;
res.Expenditure = ExpenditureType::RideConstruction;
// Stations require some massaging of the track type for comparing
auto comparableTrackType = _trackType;
switch (_trackType)
{
case TrackElemType::BeginStation:
case TrackElemType::MiddleStation:
comparableTrackType = TrackElemType::EndStation;
break;
}
auto comparableTrackType = normaliseTrackType(_trackType);
bool found = false;
bool isGhost = GetFlags() & GAME_COMMAND_FLAG_GHOST;
@@ -92,14 +96,7 @@ GameActions::Result TrackRemoveAction::Query() const
if (tileElement->IsGhost() != isGhost)
continue;
auto tileTrackType = tileElement->AsTrack()->GetTrackType();
switch (tileTrackType)
{
case TrackElemType::BeginStation:
case TrackElemType::MiddleStation:
tileTrackType = TrackElemType::EndStation;
break;
}
auto tileTrackType = normaliseTrackType(tileElement->AsTrack()->GetTrackType());
if (tileTrackType != comparableTrackType)
continue;
@@ -265,15 +262,7 @@ GameActions::Result TrackRemoveAction::Execute() const
res.Position.z = _origin.z;
res.Expenditure = ExpenditureType::RideConstruction;
// Stations require some massaging of the track type for comparing
auto comparableTrackType = _trackType;
switch (_trackType)
{
case TrackElemType::BeginStation:
case TrackElemType::MiddleStation:
comparableTrackType = TrackElemType::EndStation;
break;
}
auto comparableTrackType = normaliseTrackType(_trackType);
bool found = false;
bool isGhost = GetFlags() & GAME_COMMAND_FLAG_GHOST;
@@ -299,14 +288,7 @@ GameActions::Result TrackRemoveAction::Execute() const
if (tileElement->IsGhost() != isGhost)
continue;
auto tileTrackType = tileElement->AsTrack()->GetTrackType();
switch (tileTrackType)
{
case TrackElemType::BeginStation:
case TrackElemType::MiddleStation:
tileTrackType = TrackElemType::EndStation;
break;
}
auto tileTrackType = normaliseTrackType(tileElement->AsTrack()->GetTrackType());
if (tileTrackType != comparableTrackType)
continue;