From 2637c06f88ed6f9dea55449883f42a62c30f19d8 Mon Sep 17 00:00:00 2001 From: Michael Lutz Date: Thu, 4 Nov 2021 00:10:13 +0100 Subject: Codechange: Un-bitstuff timetable commands. --- src/timetable_cmd.cpp | 68 +++++++++++++++++---------------------------------- 1 file changed, 22 insertions(+), 46 deletions(-) (limited to 'src/timetable_cmd.cpp') diff --git a/src/timetable_cmd.cpp b/src/timetable_cmd.cpp index c889e5374..3e5695b51 100644 --- a/src/timetable_cmd.cpp +++ b/src/timetable_cmd.cpp @@ -87,32 +87,24 @@ static void ChangeTimetable(Vehicle *v, VehicleOrderID order_number, uint16 val, /** * Change timetable data of an order. * @param flags Operation to perform. - * @param tile Not used. - * @param p1 Various bitstuffed elements - * - p1 = (bit 0-19) - Vehicle with the orders to change. - * - p1 = (bit 20-27) - Order index to modify. - * - p1 = (bit 28-29) - Timetable data to change (@see ModifyTimetableFlags) - * @param p2 The amount of time to wait. - * - p2 = (bit 0-15) - The data to modify as specified by p1 bits 28-29. - * 0 to clear times, UINT16_MAX to clear speed limit. - * @param text unused + * @param veh Vehicle with the orders to change. + * @param order_number Order index to modify. + * @param mtf Timetable data to change (@see ModifyTimetableFlags) + * @param data The data to modify as specified by \c mtf. + * 0 to clear times, UINT16_MAX to clear speed limit. * @return the cost of this operation or an error */ -CommandCost CmdChangeTimetable(DoCommandFlag flags, TileIndex tile, uint32 p1, uint32 p2, const std::string &text) +CommandCost CmdChangeTimetable(DoCommandFlag flags, VehicleID veh, VehicleOrderID order_number, ModifyTimetableFlags mtf, uint16 data) { - VehicleID veh = GB(p1, 0, 20); - Vehicle *v = Vehicle::GetIfValid(veh); if (v == nullptr || !v->IsPrimaryVehicle()) return CMD_ERROR; CommandCost ret = CheckOwnership(v->owner); if (ret.Failed()) return ret; - VehicleOrderID order_number = GB(p1, 20, 8); Order *order = v->GetOrder(order_number); if (order == nullptr || order->IsType(OT_IMPLICIT)) return CMD_ERROR; - ModifyTimetableFlags mtf = Extract(p1); if (mtf >= MTF_END) return CMD_ERROR; int wait_time = order->GetWaitTime(); @@ -120,15 +112,15 @@ CommandCost CmdChangeTimetable(DoCommandFlag flags, TileIndex tile, uint32 p1, u int max_speed = order->GetMaxSpeed(); switch (mtf) { case MTF_WAIT_TIME: - wait_time = GB(p2, 0, 16); + wait_time = data; break; case MTF_TRAVEL_TIME: - travel_time = GB(p2, 0, 16); + travel_time = data; break; case MTF_TRAVEL_SPEED: - max_speed = GB(p2, 0, 16); + max_speed = data; if (max_speed == 0) max_speed = UINT16_MAX; // Disable speed limit. break; @@ -185,17 +177,11 @@ CommandCost CmdChangeTimetable(DoCommandFlag flags, TileIndex tile, uint32 p1, u /** * Clear the lateness counter to make the vehicle on time. * @param flags Operation to perform. - * @param tile Not used. - * @param p1 Various bitstuffed elements - * - p1 = (bit 0-19) - Vehicle with the orders to change. - * @param p2 unused - * @param text unused + * @param veh Vehicle with the orders to change. * @return the cost of this operation or an error */ -CommandCost CmdSetVehicleOnTime(DoCommandFlag flags, TileIndex tile, uint32 p1, uint32 p2, const std::string &text) +CommandCost CmdSetVehicleOnTime(DoCommandFlag flags, VehicleID veh) { - VehicleID veh = GB(p1, 0, 20); - Vehicle *v = Vehicle::GetIfValid(veh); if (v == nullptr || !v->IsPrimaryVehicle() || v->orders.list == nullptr) return CMD_ERROR; @@ -251,25 +237,20 @@ static bool VehicleTimetableSorter(Vehicle * const &a, Vehicle * const &b) /** * Set the start date of the timetable. * @param flags Operation to perform. - * @param tile Not used. - * @param p2 Various bitstuffed elements - * - p2 = (bit 0-19) - Vehicle ID. - * - p2 = (bit 20) - Set to 1 to set timetable start for all vehicles sharing this order - * @param p2 The timetable start date. - * @param text Not used. + * @param veh_id Vehicle ID. + * @param timetable_all Set to set timetable start for all vehicles sharing this order + * @param start_date The timetable start date. * @return The error or cost of the operation. */ -CommandCost CmdSetTimetableStart(DoCommandFlag flags, TileIndex tile, uint32 p1, uint32 p2, const std::string &text) +CommandCost CmdSetTimetableStart(DoCommandFlag flags, VehicleID veh_id, bool timetable_all, Date start_date) { - bool timetable_all = HasBit(p1, 20); - Vehicle *v = Vehicle::GetIfValid(GB(p1, 0, 20)); + Vehicle *v = Vehicle::GetIfValid(veh_id); if (v == nullptr || !v->IsPrimaryVehicle() || v->orders.list == nullptr) return CMD_ERROR; CommandCost ret = CheckOwnership(v->owner); if (ret.Failed()) return ret; /* Don't let a timetable start more than 15 years into the future or 1 year in the past. */ - Date start_date = (Date)p2; if (start_date < 0 || start_date > MAX_DAY) return CMD_ERROR; if (start_date - _date > 15 * DAYS_IN_LEAP_YEAR) return CMD_ERROR; if (_date - start_date > DAYS_IN_LEAP_YEAR) return CMD_ERROR; @@ -316,18 +297,13 @@ CommandCost CmdSetTimetableStart(DoCommandFlag flags, TileIndex tile, uint32 p1, * actually takes to complete it. When starting to autofill the current times * are cleared and the timetable will start again from scratch. * @param flags Operation to perform. - * @param tile Not used. - * @param p1 Vehicle index. - * @param p2 Various bitstuffed elements - * - p2 = (bit 0) - Set to 1 to enable, 0 to disable autofill. - * - p2 = (bit 1) - Set to 1 to preserve waiting times in non-destructive mode - * @param text unused + * @param veh Vehicle index. + * @param autofill Enable or disable autofill + * @param preserve_wait_time Set to preserve waiting times in non-destructive mode * @return the cost of this operation or an error */ -CommandCost CmdAutofillTimetable(DoCommandFlag flags, TileIndex tile, uint32 p1, uint32 p2, const std::string &text) +CommandCost CmdAutofillTimetable(DoCommandFlag flags, VehicleID veh, bool autofill, bool preserve_wait_time) { - VehicleID veh = GB(p1, 0, 20); - Vehicle *v = Vehicle::GetIfValid(veh); if (v == nullptr || !v->IsPrimaryVehicle() || v->orders.list == nullptr) return CMD_ERROR; @@ -335,7 +311,7 @@ CommandCost CmdAutofillTimetable(DoCommandFlag flags, TileIndex tile, uint32 p1, if (ret.Failed()) return ret; if (flags & DC_EXEC) { - if (HasBit(p2, 0)) { + if (autofill) { /* Start autofilling the timetable, which clears the * "timetable has started" bit. Times are not cleared anymore, but are * overwritten when the order is reached now. */ @@ -343,7 +319,7 @@ CommandCost CmdAutofillTimetable(DoCommandFlag flags, TileIndex tile, uint32 p1, ClrBit(v->vehicle_flags, VF_TIMETABLE_STARTED); /* Overwrite waiting times only if they got longer */ - if (HasBit(p2, 1)) SetBit(v->vehicle_flags, VF_AUTOFILL_PRES_WAIT_TIME); + if (preserve_wait_time) SetBit(v->vehicle_flags, VF_AUTOFILL_PRES_WAIT_TIME); v->timetable_start = 0; v->lateness_counter = 0; -- cgit v1.2.3-54-g00ecf