From 251008663ba59d1f452be6c6425cfbe077936899 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lo=C3=AFc=20Guilloux?= Date: Wed, 10 Jan 2024 16:23:36 +0100 Subject: [PATCH] Fix #11748: Incorrect clamping of negative service interval values (#11749) (cherry picked from commit f7bd70baec83b97e8b4e91f1425b2b105d3ac9f6) --- src/order_cmd.cpp | 2 +- src/order_func.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/order_cmd.cpp b/src/order_cmd.cpp index 8d05bd01a9..d3fdaf30ac 100644 --- a/src/order_cmd.cpp +++ b/src/order_cmd.cpp @@ -2946,7 +2946,7 @@ void DeleteVehicleOrders(Vehicle *v, bool keep_orderlist, bool reset_order_indic * @param interval proposed service interval * @return Clamped service interval */ -uint16_t GetServiceIntervalClamped(uint interval, bool ispercent) +uint16_t GetServiceIntervalClamped(int interval, bool ispercent) { return ispercent ? Clamp(interval, MIN_SERVINT_PERCENT, MAX_SERVINT_PERCENT) : Clamp(interval, MIN_SERVINT_DAYS, MAX_SERVINT_DAYS); } diff --git a/src/order_func.h b/src/order_func.h index 31bfc86dbf..e8be38ff56 100644 --- a/src/order_func.h +++ b/src/order_func.h @@ -46,7 +46,7 @@ static const uint DEF_SERVINT_PERCENT = 50; static const uint MIN_SERVINT_PERCENT = 5; static const uint MAX_SERVINT_PERCENT = 90; -uint16_t GetServiceIntervalClamped(uint interval, bool ispercent); +uint16_t GetServiceIntervalClamped(int interval, bool ispercent); bool OrderConditionCompare(OrderConditionComparator occ, int variable, int value); const char *GetOrderTypeName(OrderType order_type);