Fix OpenTTD#11748: Incorrect clamping of negative service interval va…

…lues (OpenTTD#11749)
glx22 · Jan 10, 2024 · f7bd70b · f7bd70b
1 parent 86b046c
commit f7bd70b
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/src/order_cmd.cpp b/src/order_cmd.cpp
@@ -1849,7 +1849,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
@@ -37,6 +37,6 @@ 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);
 
 #endif /* ORDER_FUNC_H */