1
0
Fork 0

Compare commits

...

7 Commits

Author SHA1 Message Date
DrewJenn 87ec2cbf22
Merge 7212fece8b into aaf5d39b15 2025-07-11 04:47:49 +00:00
DrewJenn 7212fece8b
Merge branch 'master' into timetable-clear-all-fix 2025-06-18 09:59:33 -05:00
DrewJenn 3d330a26fa Update timetable_cmd.cpp 2025-04-11 11:13:38 -05:00
DrewJenn 323aea13f7 Update timetable_cmd.cpp
syntax fix
2025-04-11 11:13:38 -05:00
DrewJenn 9b4047f1fd Update timetable_cmd.cpp
small mistake on flag fixed
2025-04-11 11:13:38 -05:00
DrewJenn 02346f0b32 Update timetable_cmd.cpp 2025-04-11 11:13:38 -05:00
DrewJenn 6d8c9e26cb Update timetable_cmd.cpp
Fix for bug #12980
2025-04-11 11:13:38 -05:00
1 changed files with 4 additions and 1 deletions

View File

@ -237,11 +237,14 @@ CommandCost CmdBulkChangeTimetable(DoCommandFlags flags, VehicleID veh, ModifyTi
if (v->GetNumOrders() == 0) return CMD_ERROR; if (v->GetNumOrders() == 0) return CMD_ERROR;
ModifyTimetableFlags mtf_compare = (mtf == MTF_TRAVEL_TIME) ? MTF_WAIT_TIME : MTF_TRAVEL_TIME;
if (flags.Test(DoCommandFlag::Execute)) { if (flags.Test(DoCommandFlag::Execute)) {
for (VehicleOrderID order_number = 0; order_number < v->GetNumOrders(); order_number++) { for (VehicleOrderID order_number = 0; order_number < v->GetNumOrders(); order_number++) {
Order *order = v->GetOrder(order_number); Order *order = v->GetOrder(order_number);
if (order == nullptr || order->IsType(OT_IMPLICIT)) continue; if (order == nullptr || order->IsType(OT_IMPLICIT)) continue;
if (data == 0 && mtf != MTF_TRAVEL_SPEED) {
Command<CMD_CHANGE_TIMETABLE>::Do(DoCommandFlag::Execute, v->index, order_number, mtf_compare, data);
}
Command<CMD_CHANGE_TIMETABLE>::Do(DoCommandFlag::Execute, v->index, order_number, mtf, data); Command<CMD_CHANGE_TIMETABLE>::Do(DoCommandFlag::Execute, v->index, order_number, mtf, data);
} }
} }