cpp/openttd-patchpack/source Changeset - r27129:34481b1f4b53

Changeset - r27129:34481b1f4b53

Parent rev.

Child rev.

[Not reviewed]

master

0 3 0

Tyler Trahan - 14 months ago 2023-04-21 22:36:06
tyler@tylertrahan.com

Fix #10289: Don't silently fail when setting timetable start dates (#10690)

3 files changed with 3 insertions and 2 deletions:

src/lang/english.txt

src/timetable_cmd.cpp

src/timetable_gui.cpp

0 comments (0 inline, 0 general)

src/lang/english.txt

➞

Show inline comments

@@ @@ -5110,6 +5110,7 @@ STR_ERROR_NO_BUOY @@
 STR_ERROR_CAN_T_TIMETABLE_VEHICLE                               :{WHITE}Can't timetable vehicle...
 STR_ERROR_TIMETABLE_ONLY_WAIT_AT_STATIONS                       :{WHITE}Vehicles can only wait at stations
 STR_ERROR_TIMETABLE_NOT_STOPPING_HERE                           :{WHITE}This vehicle is not stopping at this station
 STR_ERROR_TIMETABLE_INCOMPLETE                                  :{WHITE}... timetable is incomplete
 # Sign related errors
 STR_ERROR_TOO_MANY_SIGNS                                        :{WHITE}... too many signs

src/timetable_cmd.cpp

➞

Show inline comments

@@ @@ -306,7 +306,7 @@ CommandCost CmdSetTimetableStart(DoComma @@
 	if (start_date < 0 || start_date > MAX_DAY) return CMD_ERROR;
 	if (start_date - _date > MAX_TIMETABLE_START_YEARS * DAYS_IN_LEAP_YEAR) return CMD_ERROR;
 	if (_date - start_date > DAYS_IN_LEAP_YEAR) return CMD_ERROR;
-	if (timetable_all && !v->orders->IsCompleteTimetable()) return CMD_ERROR;
+	if (timetable_all && !v->orders->IsCompleteTimetable()) return CommandCost(STR_ERROR_TIMETABLE_INCOMPLETE);
 	if (timetable_all && start_date + total_duration / DAY_TICKS > MAX_DAY) return CMD_ERROR;
 	if (flags & DC_EXEC) {

src/timetable_gui.cpp

➞

Show inline comments

@@ @@ -572,7 +572,7 @@ struct TimetableWindow : Window { @@
+			}
 			case WID_VT_START_DATE: // Change the date that the timetable starts.
-				ShowSetDateWindow(this, v->index, _date, _cur_year, _cur_year + MAX_TIMETABLE_START_YEARS, ChangeTimetableStartCallback, reinterpret_cast<void *>(static_cast<uintptr_t>(v->orders->IsCompleteTimetable() && _ctrl_pressed)));
 				ShowSetDateWindow(this, v->index, _date, _cur_year, _cur_year + MAX_TIMETABLE_START_YEARS, ChangeTimetableStartCallback, reinterpret_cast<void *>(static_cast<uintptr_t>(_ctrl_pressed)));
 				break;
 			case WID_VT_CHANGE_TIME: { // "Wait For" button.

0 comments (0 inline, 0 general)