From 6d8c9e26cbcc2a5687d3fb8cf6eaec1974bd160d Mon Sep 17 00:00:00 2001 From: DrewJenn Date: Mon, 7 Apr 2025 13:18:38 -0500 Subject: [PATCH 1/5] Update timetable_cmd.cpp Fix for bug #12980 --- src/timetable_cmd.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/timetable_cmd.cpp b/src/timetable_cmd.cpp index 3dcff1f57c..07bc66de27 100644 --- a/src/timetable_cmd.cpp +++ b/src/timetable_cmd.cpp @@ -241,7 +241,7 @@ CommandCost CmdBulkChangeTimetable(DoCommandFlags flags, VehicleID veh, ModifyTi for (VehicleOrderID order_number = 0; order_number < v->GetNumOrders(); order_number++) { Order *order = v->GetOrder(order_number); if (order == nullptr || order->IsType(OT_IMPLICIT)) continue; - + if(data == 0 && mtf != MTF_TRAVEL_SPEED) Command::Do(DoCommandFlag::Execute, v->index, order_number, (mtf == MTF_TRAVEL_TIME) ? MTF_WAIT_TIME : MTF_TRAVEL_TIME, data); Command::Do(DoCommandFlag::Execute, v->index, order_number, mtf, data); } } From 02346f0b3248416a6eb0899bc239c8ef33084c47 Mon Sep 17 00:00:00 2001 From: DrewJenn Date: Mon, 7 Apr 2025 13:50:09 -0500 Subject: [PATCH 2/5] Update timetable_cmd.cpp --- src/timetable_cmd.cpp | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/timetable_cmd.cpp b/src/timetable_cmd.cpp index 07bc66de27..f1861f412c 100644 --- a/src/timetable_cmd.cpp +++ b/src/timetable_cmd.cpp @@ -237,11 +237,14 @@ CommandCost CmdBulkChangeTimetable(DoCommandFlags flags, VehicleID veh, ModifyTi if (v->GetNumOrders() == 0) return CMD_ERROR; + bool mtf_compare = (mtf == MTF_TRAVEL_TIME) ? MTF_WAIT_TIME : MTF_TRAVEL_TIME, data); if (flags.Test(DoCommandFlag::Execute)) { for (VehicleOrderID order_number = 0; order_number < v->GetNumOrders(); order_number++) { Order *order = v->GetOrder(order_number); if (order == nullptr || order->IsType(OT_IMPLICIT)) continue; - if(data == 0 && mtf != MTF_TRAVEL_SPEED) Command::Do(DoCommandFlag::Execute, v->index, order_number, (mtf == MTF_TRAVEL_TIME) ? MTF_WAIT_TIME : MTF_TRAVEL_TIME, data); + if (data == 0 && mtf != MTF_TRAVEL_SPEED) { + Command::Do(DoCommandFlag::Execute, v->index, order_number, mtf_compare, data); + } Command::Do(DoCommandFlag::Execute, v->index, order_number, mtf, data); } } From 9b4047f1fdc24c616032283a6656a096fc206b40 Mon Sep 17 00:00:00 2001 From: DrewJenn Date: Mon, 7 Apr 2025 14:49:41 -0500 Subject: [PATCH 3/5] Update timetable_cmd.cpp small mistake on flag fixed --- src/timetable_cmd.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/timetable_cmd.cpp b/src/timetable_cmd.cpp index f1861f412c..3b24604955 100644 --- a/src/timetable_cmd.cpp +++ b/src/timetable_cmd.cpp @@ -237,7 +237,7 @@ CommandCost CmdBulkChangeTimetable(DoCommandFlags flags, VehicleID veh, ModifyTi if (v->GetNumOrders() == 0) return CMD_ERROR; - bool mtf_compare = (mtf == MTF_TRAVEL_TIME) ? MTF_WAIT_TIME : MTF_TRAVEL_TIME, data); + ModifyTimetableFlags mtf_compare = (mtf == MTF_TRAVEL_TIME) ? MTF_WAIT_TIME : MTF_TRAVEL_TIME, data); if (flags.Test(DoCommandFlag::Execute)) { for (VehicleOrderID order_number = 0; order_number < v->GetNumOrders(); order_number++) { Order *order = v->GetOrder(order_number); From 323aea13f7647a8a628163de7cf896d15c19c114 Mon Sep 17 00:00:00 2001 From: DrewJenn Date: Tue, 8 Apr 2025 08:33:17 -0500 Subject: [PATCH 4/5] Update timetable_cmd.cpp syntax fix --- src/timetable_cmd.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/timetable_cmd.cpp b/src/timetable_cmd.cpp index 3b24604955..e9e662e19e 100644 --- a/src/timetable_cmd.cpp +++ b/src/timetable_cmd.cpp @@ -237,7 +237,7 @@ CommandCost CmdBulkChangeTimetable(DoCommandFlags flags, VehicleID veh, ModifyTi if (v->GetNumOrders() == 0) return CMD_ERROR; - ModifyTimetableFlags mtf_compare = (mtf == MTF_TRAVEL_TIME) ? MTF_WAIT_TIME : MTF_TRAVEL_TIME, data); + ModifyTimetableFlags mtf_compare = (mtf == MTF_TRAVEL_TIME) ? MTF_WAIT_TIME : MTF_TRAVEL_TIME); if (flags.Test(DoCommandFlag::Execute)) { for (VehicleOrderID order_number = 0; order_number < v->GetNumOrders(); order_number++) { Order *order = v->GetOrder(order_number); From 3d330a26facddad9f2b9acd7711057b6cace4a19 Mon Sep 17 00:00:00 2001 From: DrewJenn Date: Tue, 8 Apr 2025 08:35:35 -0500 Subject: [PATCH 5/5] Update timetable_cmd.cpp --- src/timetable_cmd.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/timetable_cmd.cpp b/src/timetable_cmd.cpp index e9e662e19e..a5988a00b7 100644 --- a/src/timetable_cmd.cpp +++ b/src/timetable_cmd.cpp @@ -237,7 +237,7 @@ CommandCost CmdBulkChangeTimetable(DoCommandFlags flags, VehicleID veh, ModifyTi if (v->GetNumOrders() == 0) return CMD_ERROR; - ModifyTimetableFlags mtf_compare = (mtf == MTF_TRAVEL_TIME) ? MTF_WAIT_TIME : MTF_TRAVEL_TIME); + ModifyTimetableFlags mtf_compare = (mtf == MTF_TRAVEL_TIME) ? MTF_WAIT_TIME : MTF_TRAVEL_TIME; if (flags.Test(DoCommandFlag::Execute)) { for (VehicleOrderID order_number = 0; order_number < v->GetNumOrders(); order_number++) { Order *order = v->GetOrder(order_number);