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

Remove local instances of std::optional

Browse Source
This commit is contained in:
Hielke Morsink
2021-09-13 23:26:14 +02:00
parent 2af5e0dc82
commit 2ed7c217bf
1 changed files with 4 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/openrct2-ui/scripting/ScTileSelection.hpp
View File

@@ -139,7 +139,6 @@ namespace OpenRCT2::Scripting
private:
static std::optional<CoordsXY> GetCoordsXY(const DukValue& dukCoords)
{
std::optional<CoordsXY> result;
if (dukCoords.type() == DukValue::Type::OBJECT)
{
auto dukX = dukCoords["x"];
@@ -148,16 +147,15 @@ namespace OpenRCT2::Scripting
auto dukY = dukCoords["y"];
if (dukY.type() == DukValue::Type::NUMBER)
{
result = { dukX.as_int(), dukY.as_int() };
return CoordsXY(dukX.as_int(), dukY.as_int());
}
}
}
return result;
return std::nullopt;
}
static std::optional<MapRange> GetMapRange(const DukValue& dukMapRange)
{
std::optional<MapRange> result;
if (dukMapRange.type() == DukValue::Type::OBJECT)
{
auto leftTop = GetCoordsXY(dukMapRange["leftTop"]);
@@ -166,11 +164,11 @@ namespace OpenRCT2::Scripting
auto rightBottom = GetCoordsXY(dukMapRange["rightBottom"]);
if (rightBottom.has_value())
{
result = MapRange(leftTop->x, leftTop->y, rightBottom->x, rightBottom->y);
return MapRange(leftTop->x, leftTop->y, rightBottom->x, rightBottom->y);
}
}
}
return result;
return std::nullopt;
}
};
} // namespace OpenRCT2::Scripting