From b6f3552e4b2ee8643273b87d7d38f7945ff6ba3c Mon Sep 17 00:00:00 2001 From: glx22 Date: Fri, 10 Feb 2023 18:11:57 +0100 Subject: [PATCH] Fix: [Script] Inconsistent precondition failure return values --- src/script/api/script_airport.cpp | 2 +- src/script/api/script_road.cpp | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/script/api/script_airport.cpp b/src/script/api/script_airport.cpp index c8bdea2835..2106536353 100644 --- a/src/script/api/script_airport.cpp +++ b/src/script/api/script_airport.cpp @@ -158,7 +158,7 @@ /* static */ uint16 ScriptAirport::GetMaintenanceCostFactor(AirportType type) { - if (!IsAirportInformationAvailable(type)) return INVALID_TOWN; + if (!IsAirportInformationAvailable(type)) return 0; return AirportSpec::Get(type)->maintenance_cost; } diff --git a/src/script/api/script_road.cpp b/src/script/api/script_road.cpp index 6ee2a41158..a7979bf126 100644 --- a/src/script/api/script_road.cpp +++ b/src/script/api/script_road.cpp @@ -452,8 +452,8 @@ static bool NeighbourHasReachableRoad(::RoadType rt, TileIndex start_tile, DiagD /* static */ int32 ScriptRoad::GetNeighbourRoadCount(TileIndex tile) { - if (!::IsValidTile(tile)) return false; - if (!IsRoadTypeAvailable(GetCurrentRoadType())) return false; + if (!::IsValidTile(tile)) return -1; + if (!IsRoadTypeAvailable(GetCurrentRoadType())) return -1; ::RoadType rt = (::RoadType)GetCurrentRoadType(); int32 neighbour = 0; @@ -627,7 +627,7 @@ static bool NeighbourHasReachableRoad(::RoadType rt, TileIndex start_tile, DiagD /* static */ int32 ScriptRoad::GetMaxSpeed(RoadType road_type) { - if (!ScriptRoad::IsRoadTypeAvailable(road_type)) return 0; + if (!ScriptRoad::IsRoadTypeAvailable(road_type)) return -1; return GetRoadTypeInfo((::RoadType)road_type)->max_speed; }