diff options
| author | yexo <yexo@openttd.org> | 2009-05-26 21:59:49 +0000 |
|---|---|---|
| committer | yexo <yexo@openttd.org> | 2009-05-26 21:59:49 +0000 |
| commit | 0d56cfabfa6b6553f02a701d3ec3d92cc7067b63 (patch) | |
| tree | cbedc97360c42339860d6b03483900a203cf2ec3 /src/order_cmd.cpp | |
| parent | aa62ec0a1f7cc2416e0397eeccc90156d27b8b44 (diff) | |
| download | openttd-0d56cfabfa6b6553f02a701d3ec3d92cc7067b63.tar.xz | |
(svn r16439) -Change: Make the default vehicle servicing settings company-based settings, so in a multiplayer game everyone can change them.
Diffstat (limited to 'src/order_cmd.cpp')
| -rw-r--r-- | src/order_cmd.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/order_cmd.cpp b/src/order_cmd.cpp index 68d255d78..c367a9e87 100644 --- a/src/order_cmd.cpp +++ b/src/order_cmd.cpp @@ -1340,7 +1340,7 @@ CommandCost CmdRestoreOrderIndex(TileIndex tile, DoCommandFlag flags, uint32 p1, Vehicle *v = Vehicle::GetIfValid(p1); /* Check the vehicle type and ownership, and if the service interval and order are in range */ if (v == NULL || !CheckOwnership(v->owner)) return CMD_ERROR; - if (serv_int != GetServiceIntervalClamped(serv_int) || cur_ord >= v->GetNumOrders()) return CMD_ERROR; + if (serv_int != GetServiceIntervalClamped(serv_int, v->owner) || cur_ord >= v->GetNumOrders()) return CMD_ERROR; if (flags & DC_EXEC) { v->cur_order_index = cur_ord; @@ -1527,9 +1527,9 @@ void DeleteVehicleOrders(Vehicle *v, bool keep_orderlist) } } -Date GetServiceIntervalClamped(uint index) +uint16 GetServiceIntervalClamped(uint interval, CompanyID company_id) { - return (_settings_game.vehicle.servint_ispercent) ? Clamp(index, MIN_SERVINT_PERCENT, MAX_SERVINT_PERCENT) : Clamp(index, MIN_SERVINT_DAYS, MAX_SERVINT_DAYS); + return (Company::Get(company_id)->settings.vehicle.servint_ispercent) ? Clamp(interval, MIN_SERVINT_PERCENT, MAX_SERVINT_PERCENT) : Clamp(interval, MIN_SERVINT_DAYS, MAX_SERVINT_DAYS); } /** |