cpp/openttd-patchpack/source Changeset - r28135:e7f3044a8685

Changeset - r28135:e7f3044a8685

Parent rev.

Child rev.

[Not reviewed]

master

0 1 0

Tyler Trahan - 13 months ago 2023-11-13 12:19:39
tyler@tylertrahan.com

Codechange: Clean up timetable start checks (#11456)

1 file changed with 10 insertions and 3 deletions:

src/timetable_cmd.cpp

0 comments (0 inline, 0 general)

src/timetable_cmd.cpp

➞

Show inline comments

@@ @@ -311,14 +311,21 @@ CommandCost CmdSetTimetableStart(DoComma @@
 	CommandCost ret = CheckOwnership(v->owner);
 	if (ret.Failed()) return ret;
-	int total_duration = v->orders->GetTimetableTotalDuration();
+	TimerGameTick::Ticks total_duration = v->orders->GetTimetableTotalDuration();
-	/* Don't let a timetable start more than 15 years into the future or 1 year in the past. */
+	/* Don't let a timetable start at an invalid date. */
 	if (start_date < 0 || start_date > CalendarTime::MAX_DATE) return CMD_ERROR;
 	/* Don't let a timetable start more than 15 years into the future... */
 	if (start_date - TimerGameCalendar::date > TimerGameCalendar::DateAtStartOfYear(MAX_TIMETABLE_START_YEARS)) return CMD_ERROR;
 	/* ...or 1 year in the past. */
 	if (TimerGameCalendar::date - start_date > CalendarTime::DAYS_IN_LEAP_YEAR) return CMD_ERROR;
 	/* If trying to distribute start dates over a shared order group, we need to know the total duration. */
 	if (timetable_all && !v->orders->IsCompleteTimetable()) return CommandCost(STR_ERROR_TIMETABLE_INCOMPLETE);
 	if (timetable_all && start_date + total_duration / Ticks::DAY_TICKS > CalendarTime::MAX_DATE) return CMD_ERROR;
 	/* Don't allow invalid start dates for other vehicles in the shared order group. */
 	if (timetable_all && start_date + (total_duration / Ticks::DAY_TICKS) > CalendarTime::MAX_DATE) return CMD_ERROR;
 	if (flags & DC_EXEC) {
 		std::vector<Vehicle *> vehs;

0 comments (0 inline, 0 general)