dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix #11748: Incorrect clamping of negative service interval values (#11749)

Browse Source 
(cherry picked from commit f7bd70baec)
This commit is contained in:
Loïc Guilloux
2024-01-10 16:23:36 +01:00
committed by Jonathan G Rennison
parent de91c56ed5
commit 251008663b
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

@@ -2946,7 +2946,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

@@ -46,7 +46,7 @@ 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);
bool OrderConditionCompare(OrderConditionComparator occ, int variable, int value); bool OrderConditionCompare(OrderConditionComparator occ, int variable, int value);
const char *GetOrderTypeName(OrderType order_type); const char *GetOrderTypeName(OrderType order_type);