mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-01-17 12:03:07 +01:00
Code Issues Releases Wiki Activity

Return GameActions::Result in TrackDesignPlaceSceneryElementRemoveGhost

Browse Source
This commit is contained in:
ζeh Matt
2021-10-29 00:50:38 +03:00
parent 5ef99ef549
commit bdb2a500bb
1 changed files with 10 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -977,18 +977,18 @@ static void TrackDesignUpdatePreviewBounds(TrackDesignState& tds, const CoordsXY
std::max(tds.PreviewMax.z, coords.z) };
}
static bool TrackDesignPlaceSceneryElementRemoveGhost(
static GameActions::Result::Ptr TrackDesignPlaceSceneryElementRemoveGhost(
CoordsXY mapCoord, const TrackDesignSceneryElement& scenery, uint8_t rotation, int32_t originZ)
{
auto entryInfo = TrackDesignPlaceSceneryElementGetEntry(scenery);
if (!entryInfo)
{
return true;
return std::make_unique<GameActions::Result>();
}
if (_trackDesignPlaceStateSceneryUnavailable)
{
return true;
return std::make_unique<GameActions::Result>();
}
int32_t z = (scenery.z * COORDS_Z_STEP) + originZ;
@@ -1025,11 +1025,11 @@ static bool TrackDesignPlaceSceneryElementRemoveGhost(
ga = std::make_unique<FootpathRemoveAction>(CoordsXYZ{ mapCoord.x, mapCoord.y, z });
break;
default:
return true;
return std::make_unique<GameActions::Result>();
}
ga->SetFlags(flags);
GameActions::ExecuteNested(ga.get());
return true;
return GameActions::ExecuteNested(ga.get());
}
static bool TrackDesignPlaceSceneryElementGetPlaceZ(TrackDesignState& tds, const TrackDesignSceneryElement& scenery)
@@ -1056,10 +1056,11 @@ static std::optional<money32> TrackDesignPlaceSceneryElement(
if (tds.PlaceOperation == PTD_OPERATION_REMOVE_GHOST && mode == 0)
{
if (TrackDesignPlaceSceneryElementRemoveGhost(mapCoord, scenery, rotation, originZ))
return 0;
auto res = TrackDesignPlaceSceneryElementRemoveGhost(mapCoord, scenery, rotation, originZ);
if (res->Error != GameActions::Status::Ok)
return std::nullopt;
return std::nullopt;
return res->Cost;
}
if (tds.PlaceOperation == PTD_OPERATION_GET_PLACE_Z)