dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Scheduled dispatch: Remove scheduled_dispatch_start_full_date_fract

Browse Source 
Use DateTicksScaled
This commit is contained in:
Jonathan G Rennison
2023-12-17 21:12:11 +00:00
parent c76a5ed638
commit e9599fd4be
11 changed files with 57 additions and 134 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
src/vehicle.cpp
View File

@@ -4654,6 +4654,12 @@ void AdjustVehicleScaledTickBase(int64 delta)
for (Vehicle *v : Vehicle::Iterate()) {
if (v->timetable_start != 0) v->timetable_start += delta;
}
for (OrderList *order_list : OrderList::Iterate()) {
for (DispatchSchedule &ds : order_list->GetScheduledDispatchScheduleSet()) {
ds.SetScheduledDispatchStartTick(ds.GetScheduledDispatchStartTick() + delta);
}
}
}
void ShiftVehicleDates(int interval)
@@ -4665,25 +4671,6 @@ void ShiftVehicleDates(int interval)
* for vehicles outside of a depot. */
}
extern void VehicleDayLengthChanged(DateTicksScaled old_scaled_date_ticks, DateTicksScaled old_scaled_date_ticks_offset, uint8 old_day_length_factor)
{
if (_settings_game.economy.day_length_factor == old_day_length_factor || !_settings_game.game_time.time_in_minutes) return;
for (OrderList *orderlist : OrderList::Iterate()) {
for (DispatchSchedule &ds : orderlist->GetScheduledDispatchScheduleSet()) {
if (ds.GetScheduledDispatchStartDatePart() >= 0) {
DateTicksScaled start = ((int64)ds.GetScheduledDispatchStartDatePart() * DAY_TICKS * old_day_length_factor) +
ds.GetScheduledDispatchStartDateFractPart() + old_scaled_date_ticks_offset;
start += (_scaled_date_ticks - old_scaled_date_ticks);
Date date;
uint16 full_date_fract;
std::tie(date, full_date_fract) = ScaledDateTicksToDateAndFullSubTicks(start);
ds.SetScheduledDispatchStartDate(date, full_date_fract);
}
}
}
}
/**
* Calculates the maximum weight of the ground vehicle when loaded.
* @return Weight in tonnes