diff --git a/src/command.cpp b/src/command.cpp index 76608bc8c2..0bb267c381 100644 --- a/src/command.cpp +++ b/src/command.cpp @@ -302,6 +302,7 @@ CommandProc CmdScheduledDispatchRenameSchedule; CommandProc CmdScheduledDispatchDuplicateSchedule; CommandProc CmdScheduledDispatchAppendVehicleSchedules; CommandProc CmdScheduledDispatchAdjust; +CommandProc CmdScheduledDispatchSwapSchedules; CommandProc CmdAddPlan; CommandProcEx CmdAddPlanLine; @@ -564,6 +565,7 @@ static const Command _command_proc_table[] = { DEF_CMD(CmdScheduledDispatchDuplicateSchedule, 0, CMDT_ROUTE_MANAGEMENT ), // CMD_SCHEDULED_DISPATCH_DUPLICATE_SCHEDULE DEF_CMD(CmdScheduledDispatchAppendVehicleSchedules, 0, CMDT_ROUTE_MANAGEMENT ), // CMD_SCHEDULED_DISPATCH_APPEND_VEHICLE_SCHEDULE DEF_CMD(CmdScheduledDispatchAdjust, 0, CMDT_ROUTE_MANAGEMENT ), // CMD_SCHEDULED_DISPATCH_ADJUST + DEF_CMD(CmdScheduledDispatchSwapSchedules, 0, CMDT_ROUTE_MANAGEMENT ), // CMD_SCHEDULED_DISPATCH_SWAP_SCHEDULES DEF_CMD(CmdAddPlan, CMD_NO_TEST, CMDT_OTHER_MANAGEMENT ), // CMD_ADD_PLAN DEF_CMD(CmdAddPlanLine, CMD_NO_TEST, CMDT_OTHER_MANAGEMENT ), // CMD_ADD_PLAN_LINE diff --git a/src/command_func.h b/src/command_func.h index 30e8cc18c7..a2af054cb6 100644 --- a/src/command_func.h +++ b/src/command_func.h @@ -157,5 +157,6 @@ CommandCallback CcMoveNewVirtualEngine; /* schdispatch_gui.cpp */ CommandCallback CcAddNewSchDispatchSchedule; +CommandCallback CcSwapSchDispatchSchedules; #endif /* COMMAND_FUNC_H */ diff --git a/src/command_type.h b/src/command_type.h index f6c28b0f38..f38414483c 100644 --- a/src/command_type.h +++ b/src/command_type.h @@ -529,6 +529,7 @@ enum Commands { CMD_SCHEDULED_DISPATCH_DUPLICATE_SCHEDULE, ///< scheduled dispatch duplicate schedule CMD_SCHEDULED_DISPATCH_APPEND_VEHICLE_SCHEDULE, ///< scheduled dispatch append schedules from another vehicle CMD_SCHEDULED_DISPATCH_ADJUST, ///< scheduled dispatch adjust time offsets in schedule + CMD_SCHEDULED_DISPATCH_SWAP_SCHEDULES, ///< scheduled dispatch swap schedules in order CMD_ADD_PLAN, CMD_ADD_PLAN_LINE, diff --git a/src/lang/extra/english.txt b/src/lang/extra/english.txt index 7676b52535..7a9ba1ffd3 100644 --- a/src/lang/extra/english.txt +++ b/src/lang/extra/english.txt @@ -2058,6 +2058,7 @@ STR_SCHDISPATCH_NAMED_SCHEDULE_ID :{BLACK}{RAW_STR STR_SCHDISPATCH_RENAME_SCHEDULE_TOOLTIP :{BLACK}Name schedule STR_SCHDISPATCH_RENAME_SCHEDULE_CAPTION :{WHITE}Name schedule STR_ERROR_CAN_T_RENAME_SCHEDULE :{WHITE}Can't name schedule... +STR_SCHDISPATCH_MOVE_SCHEDULE :{BLACK}Change position of current schedule in schedule list STR_SCHDISPATCH_SUMMARY_LAST_DEPARTURE_PAST :{BLACK}Last departure at {DATE_WALLCLOCK_TINY}. STR_SCHDISPATCH_SUMMARY_LAST_DEPARTURE_FUTURE :{BLACK}Last departure has not left yet, it will depart at {DATE_WALLCLOCK_TINY}. diff --git a/src/network/network_command.cpp b/src/network/network_command.cpp index 97efaef724..7097de4697 100644 --- a/src/network/network_command.cpp +++ b/src/network/network_command.cpp @@ -55,6 +55,7 @@ static CommandCallback * const _callback_table[] = { /* 0x20 */ CcAddVirtualEngine, /* 0x21 */ CcMoveNewVirtualEngine, /* 0x22 */ CcAddNewSchDispatchSchedule, + /* 0x23 */ CcSwapSchDispatchSchedules, }; /** diff --git a/src/schdispatch_cmd.cpp b/src/schdispatch_cmd.cpp index cda2241190..4d4de5965e 100644 --- a/src/schdispatch_cmd.cpp +++ b/src/schdispatch_cmd.cpp @@ -569,6 +569,61 @@ CommandCost CmdScheduledDispatchAdjust(TileIndex tile, DoCommandFlag flags, uint return CommandCost(); } +/** + * Swap two schedules in dispatch schedule list + * + * @param tile Not used. + * @param flags Operation to perform. + * @param p1 Vehicle index + * @param p2 various bitstuffed elements + * - p2 = (bit 0 - 15) - Schedule index 1 + * - p2 = (bit 16 - 31) - Schedule index 2 + * @param unused + * @return the cost of this operation or an error + */ +CommandCost CmdScheduledDispatchSwapSchedules(TileIndex tile, DoCommandFlag flags, uint32 p1, uint32 p2, const char *text) +{ + VehicleID veh = GB(p1, 0, 20); + uint schedule_index_1 = GB(p2, 0, 16); + uint schedule_index_2 = GB(p2, 16, 16); + + Vehicle *v = Vehicle::GetIfValid(veh); + if (v == nullptr || !v->IsPrimaryVehicle()) return CMD_ERROR; + + CommandCost ret = CheckOwnership(v->owner); + if (ret.Failed()) return ret; + + if (v->orders == nullptr) return CMD_ERROR; + + if (schedule_index_1 == schedule_index_2) return CMD_ERROR; + if (schedule_index_1 >= v->orders->GetScheduledDispatchScheduleCount()) return CMD_ERROR; + if (schedule_index_2 >= v->orders->GetScheduledDispatchScheduleCount()) return CMD_ERROR; + + if (flags & DC_EXEC) { + std::swap(v->orders->GetDispatchScheduleByIndex(schedule_index_1), v->orders->GetDispatchScheduleByIndex(schedule_index_2)); + for (Order *o = v->GetFirstOrder(); o != nullptr; o = o->next) { + int idx = o->GetDispatchScheduleIndex(); + if (idx == (int)schedule_index_1) { + o->SetDispatchScheduleIndex((int)schedule_index_2); + } else if (idx == (int)schedule_index_2) { + o->SetDispatchScheduleIndex((int)schedule_index_1); + } + if (o->IsType(OT_CONDITIONAL) && o->GetConditionVariable() == OCV_DISPATCH_SLOT) { + uint16 dispatch_slot = GB(o->GetXData(), 0, 16); + if (dispatch_slot == schedule_index_1) { + SB(o->GetXDataRef(), 0, 16, schedule_index_2); + } else if (dispatch_slot == schedule_index_2) { + SB(o->GetXDataRef(), 0, 16, schedule_index_1); + } + } + } + SchdispatchInvalidateWindows(v); + SetTimetableWindowsDirty(v, STWDF_SCHEDULED_DISPATCH); + } + + return CommandCost(); +} + /** * Set scheduled dispatch slot list. * @param dispatch_list The offset time list, must be correctly sorted. diff --git a/src/schdispatch_gui.cpp b/src/schdispatch_gui.cpp index ea6ddd4333..c4296f5361 100644 --- a/src/schdispatch_gui.cpp +++ b/src/schdispatch_gui.cpp @@ -40,9 +40,11 @@ enum SchdispatchWidgets { WID_SCHDISPATCH_CAPTION, ///< Caption of window. WID_SCHDISPATCH_RENAME, ///< Rename button. + WID_SCHDISPATCH_MOVE_LEFT, ///< Move current schedule left (-1). + WID_SCHDISPATCH_MOVE_RIGHT, ///< Move current schedule right (+1). WID_SCHDISPATCH_MATRIX, ///< Matrix of vehicles. WID_SCHDISPATCH_V_SCROLL, ///< Vertical scrollbar. - WID_SCHDISPATCH_SUMMARY_PANEL, ///< Summary panel + WID_SCHDISPATCH_SUMMARY_PANEL, ///< Summary panel WID_SCHDISPATCH_ENABLED, ///< Enable button. WID_SCHDISPATCH_HEADER, ///< Header text. @@ -332,6 +334,8 @@ struct SchdispatchWindow : GeneralVehicleWindow { this->SetWidgetDisabledState(WID_SCHDISPATCH_RENAME, unusable || v->orders->GetScheduledDispatchScheduleCount() == 0); this->SetWidgetDisabledState(WID_SCHDISPATCH_PREV, v->orders == nullptr || this->schedule_index <= 0); this->SetWidgetDisabledState(WID_SCHDISPATCH_NEXT, v->orders == nullptr || this->schedule_index >= (int)(v->orders->GetScheduledDispatchScheduleCount() - 1)); + this->SetWidgetDisabledState(WID_SCHDISPATCH_MOVE_LEFT, v->orders == nullptr || this->schedule_index <= 0); + this->SetWidgetDisabledState(WID_SCHDISPATCH_MOVE_RIGHT, v->orders == nullptr || this->schedule_index >= (int)(v->orders->GetScheduledDispatchScheduleCount() - 1)); this->SetWidgetDisabledState(WID_SCHDISPATCH_ADD_SCHEDULE, unusable || v->orders->GetScheduledDispatchScheduleCount() >= 4096); bool disabled = unusable || !HasBit(v->vehicle_flags, VF_SCHEDULED_DISPATCH) || !this->IsScheduleSelected(); @@ -770,12 +774,27 @@ struct SchdispatchWindow : GeneralVehicleWindow { MAX_LENGTH_VEHICLE_NAME_CHARS, this, CS_ALPHANUMERAL, QSF_ENABLE_DEFAULT | QSF_LEN_IN_CHARS); break; - case WID_SCHDISPATCH_ADJUST: + case WID_SCHDISPATCH_ADJUST: { if (!this->IsScheduleSelected()) break; CharSetFilter charset_filter = _settings_client.gui.timetable_in_ticks ? CS_NUMERAL_SIGNED : CS_NUMERAL_DECIMAL_SIGNED; SetDParam(0, 0); ShowQueryString(STR_JUST_INT, STR_SCHDISPATCH_ADJUST_CAPTION_MINUTE + this->GetQueryStringCaptionOffset(), 31, this, charset_filter, QSF_NONE); break; + } + + case WID_SCHDISPATCH_MOVE_LEFT: + if (!this->IsScheduleSelected()) break; + if (this->schedule_index > 0) { + DoCommandP(0, this->vehicle->index, (this->schedule_index - 1) | (this->schedule_index << 16), CMD_SCHEDULED_DISPATCH_SWAP_SCHEDULES | CMD_MSG(STR_ERROR_CAN_T_TIMETABLE_VEHICLE), CcSwapSchDispatchSchedules); + } + break; + + case WID_SCHDISPATCH_MOVE_RIGHT: + if (!this->IsScheduleSelected()) break; + if (this->schedule_index < (int)(this->vehicle->orders->GetScheduledDispatchScheduleCount() - 1)) { + DoCommandP(0, this->vehicle->index, (this->schedule_index + 1) | (this->schedule_index << 16), CMD_SCHEDULED_DISPATCH_SWAP_SCHEDULES | CMD_MSG(STR_ERROR_CAN_T_TIMETABLE_VEHICLE), CcSwapSchDispatchSchedules); + } + break; } this->SetDirty(); @@ -985,10 +1004,22 @@ void CcAddNewSchDispatchSchedule(const CommandCost &result, TileIndex tile, uint } } +void CcSwapSchDispatchSchedules(const CommandCost &result, TileIndex tile, uint32 p1, uint32 p2, uint64 p3, uint32 cmd) +{ + SchdispatchWindow *w = dynamic_cast(FindWindowById(WC_SCHDISPATCH_SLOTS, p1)); + if (w != nullptr) { + w->schedule_index = GB(p2, 0, 16); + w->AutoSelectSchedule(); + w->ReInit(); + } +} + static const NWidgetPart _nested_schdispatch_widgets[] = { NWidget(NWID_HORIZONTAL), NWidget(WWT_CLOSEBOX, COLOUR_GREY), NWidget(WWT_PUSHIMGBTN, COLOUR_GREY, WID_SCHDISPATCH_RENAME), SetMinimalSize(12, 14), SetDataTip(SPR_RENAME, STR_SCHDISPATCH_RENAME_SCHEDULE_TOOLTIP), + NWidget(WWT_PUSHIMGBTN, COLOUR_GREY, WID_SCHDISPATCH_MOVE_LEFT), SetMinimalSize(12, 14), SetDataTip(SPR_ARROW_LEFT, STR_SCHDISPATCH_MOVE_SCHEDULE), + NWidget(WWT_PUSHIMGBTN, COLOUR_GREY, WID_SCHDISPATCH_MOVE_RIGHT), SetMinimalSize(12, 14), SetDataTip(SPR_ARROW_RIGHT, STR_SCHDISPATCH_MOVE_SCHEDULE), NWidget(WWT_CAPTION, COLOUR_GREY, WID_SCHDISPATCH_CAPTION), SetDataTip(STR_SCHDISPATCH_CAPTION, STR_NULL), NWidget(WWT_SHADEBOX, COLOUR_GREY), NWidget(WWT_DEFSIZEBOX, COLOUR_GREY),