diff --git a/src/openrct2-ui/scripting/ScTileSelection.hpp b/src/openrct2-ui/scripting/ScTileSelection.hpp index 850d180378..365c99f91c 100644 --- a/src/openrct2-ui/scripting/ScTileSelection.hpp +++ b/src/openrct2-ui/scripting/ScTileSelection.hpp @@ -139,7 +139,6 @@ namespace OpenRCT2::Scripting private: static std::optional GetCoordsXY(const DukValue& dukCoords) { - std::optional 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 GetMapRange(const DukValue& dukMapRange) { - std::optional 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