mirror/OpenTTD
1
0
Fork 1
mirror of https://github.com/OpenTTD/OpenTTD.git synced 2025-08-13 09:39:10 +00:00
Code Issues Activity

Fix #11748: Incorrect clamping of negative service interval values

Browse Source
This commit is contained in:
glx22
2024-01-10 15:48:41 +01:00
parent 86b046cd26
commit 2d1eb9816a
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/order_cmd.cpp
View File

@@ -1849,7 +1849,7 @@ void DeleteVehicleOrders(Vehicle *v, bool keep_orderlist, bool reset_order_indic
* @param interval proposed service interval * @param interval proposed service interval
* @return Clamped 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); return ispercent ? Clamp(interval, MIN_SERVINT_PERCENT, MAX_SERVINT_PERCENT) : Clamp(interval, MIN_SERVINT_DAYS, MAX_SERVINT_DAYS);
} }

2
src/order_func.h
View File

@@ -37,6 +37,6 @@ static const uint DEF_SERVINT_PERCENT = 50;
static const uint MIN_SERVINT_PERCENT = 5; static const uint MIN_SERVINT_PERCENT = 5;
static const uint MAX_SERVINT_PERCENT = 90; 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 */ #endif /* ORDER_FUNC_H */