From d2b87485fb59ac3e5c646ce8a4a8372cc1fbfde4 Mon Sep 17 00:00:00 2001 From: Jonathan G Rennison Date: Mon, 30 Nov 2015 19:48:44 +0000 Subject: [PATCH] When clearing auto timetables, mark times as undefined rather than 0. Fix unautomate timetable having reversed ctrl key behaviour, update tooltip string with ctrl behaviour. Minor comment/whitespace fixes. --- src/command.cpp | 2 +- src/lang/english.txt | 2 +- src/timetable_cmd.cpp | 10 +++++----- src/timetable_gui.cpp | 2 +- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/command.cpp b/src/command.cpp index 1a26cdc5d4..b76efa86ab 100644 --- a/src/command.cpp +++ b/src/command.cpp @@ -352,7 +352,7 @@ static const Command _command_proc_table[] = { DEF_CMD(CmdChangeTimetable, 0, CMDT_ROUTE_MANAGEMENT ), // CMD_CHANGE_TIMETABLE DEF_CMD(CmdSetVehicleOnTime, 0, CMDT_ROUTE_MANAGEMENT ), // CMD_SET_VEHICLE_ON_TIME DEF_CMD(CmdAutofillTimetable, 0, CMDT_ROUTE_MANAGEMENT ), // CMD_AUTOFILL_TIMETABLE - DEF_CMD(CmdAutomateTimetable, 0, CMDT_ROUTE_MANAGEMENT ), // CMD_AUTOMATE_TIMETABLE] + DEF_CMD(CmdAutomateTimetable, 0, CMDT_ROUTE_MANAGEMENT ), // CMD_AUTOMATE_TIMETABLE DEF_CMD(CmdSetTimetableStart, 0, CMDT_ROUTE_MANAGEMENT ), // CMD_SET_TIMETABLE_START DEF_CMD(CmdOpenCloseAirport, 0, CMDT_ROUTE_MANAGEMENT ), // CMD_OPEN_CLOSE_AIRPORT diff --git a/src/lang/english.txt b/src/lang/english.txt index 38a1bf4edc..266870af64 100644 --- a/src/lang/english.txt +++ b/src/lang/english.txt @@ -3944,7 +3944,7 @@ STR_TIMETABLE_AUTOFILL :{BLACK}Autofill STR_TIMETABLE_AUTOFILL_TOOLTIP :{BLACK}Fill the timetable automatically with the values from the next journey (Ctrl+Click to try to keep waiting times) STR_TIMETABLE_AUTOMATE :{BLACK}Automate -STR_TIMETABLE_AUTOMATE_TOOLTIP :{BLACK}Manage the timetables automatically by updating the values for each journey +STR_TIMETABLE_AUTOMATE_TOOLTIP :{BLACK}Manage the timetables automatically by updating the values for each journey (Ctrl+Click when disabling to keep the current timetable) STR_TIMETABLE_EXPECTED :{BLACK}Expected STR_TIMETABLE_SCHEDULED :{BLACK}Scheduled diff --git a/src/timetable_cmd.cpp b/src/timetable_cmd.cpp index b0e41d9659..3a0902e689 100644 --- a/src/timetable_cmd.cpp +++ b/src/timetable_cmd.cpp @@ -263,9 +263,9 @@ static int CDECL VehicleTimetableSorter(Vehicle * const *ap, Vehicle * const *bp * Set the start date of the timetable. * @param tile Not used. * @param flags Operation to perform. - * @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 p1 Various bitstuffed elements + * - p1 = (bit 0-19) - Vehicle ID. + * - p1 = (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. * @return The error or cost of the operation. @@ -432,8 +432,8 @@ CommandCost CmdAutomateTimetable(TileIndex index, DoCommandFlag flags, uint32 p1 OrderList *orders = v2->orders.list; if (orders != NULL) { for (int i = 0; i < orders->GetNumOrders(); i++) { - ChangeTimetable(v2, i, 0, MTF_WAIT_TIME, true); - ChangeTimetable(v2, i, 0, MTF_TRAVEL_TIME, true); + ChangeTimetable(v2, i, 0, MTF_WAIT_TIME, false); + ChangeTimetable(v2, i, 0, MTF_TRAVEL_TIME, false); } } } diff --git a/src/timetable_gui.cpp b/src/timetable_gui.cpp index 738ae3c2e6..cb9e478ba1 100644 --- a/src/timetable_gui.cpp +++ b/src/timetable_gui.cpp @@ -612,7 +612,7 @@ struct TimetableWindow : Window { case WID_VT_AUTOMATE: { uint32 p2 = 0; if (!HasBit(v->vehicle_flags, VF_AUTOMATE_TIMETABLE)) SetBit(p2, 0); - if (!_ctrl_pressed) SetBit(p2, 1); + if (_ctrl_pressed) SetBit(p2, 1); DoCommandP(0, v->index, p2, CMD_AUTOMATE_TIMETABLE | CMD_MSG(STR_ERROR_CAN_T_TIMETABLE_VEHICLE)); break; }