Add a "default" mode to TT autofill rounding setting, set as default

Use game ticks per minute or day ticks
This commit is contained in:
Jonathan G Rennison
2021-12-03 12:01:13 +00:00
parent bc75c3af6f
commit 4e25fa199c
3 changed files with 10 additions and 6 deletions

View File

@@ -886,7 +886,8 @@ void UpdateVehicleTimetable(Vehicle *v, bool travelling)
* Thus always make sure at least one tick is used between the
* processing of different orders when filling the timetable. */
Company *owner = Company::GetIfValid(v->owner);
uint rounding_factor = owner ? owner->settings.timetable_autofill_rounding : DAY_TICKS;
uint rounding_factor = owner ? owner->settings.timetable_autofill_rounding : 0;
if (rounding_factor == 0) rounding_factor = _settings_game.game_time.time_in_minutes ? _settings_game.game_time.ticks_per_minute : DAY_TICKS;
uint time_to_set = CeilDiv(std::max(time_taken, 1U), rounding_factor) * rounding_factor;
if (travel_field && (autofilling || !real_timetable_order->IsTravelTimetabled())) {