mirror/OpenTTD
1
0
Fork 1
mirror of https://github.com/OpenTTD/OpenTTD.git synced 2025-08-24 06:59:10 +00:00
Code Issues Activity

Cleanup: Convert last departure date to tick counter

Browse Source
This commit is contained in:
James Ross
2023-12-22 14:23:57 +00:00
parent 51924e9376
commit 7e51208483
3 changed files with 9 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/base_consist.h
View File

@@ -22,8 +22,8 @@ struct BaseConsist {
TimerGameTick::Ticks lateness_counter; ///< How many ticks late (or early if negative) this vehicle is. TimerGameTick::Ticks lateness_counter; ///< How many ticks late (or early if negative) this vehicle is.
TimerGameTick::TickCounter timetable_start; ///< At what tick of TimerGameTick::counter the vehicle should start its timetable. TimerGameTick::TickCounter timetable_start; ///< At what tick of TimerGameTick::counter the vehicle should start its timetable.
TimerGameTick::Ticks first_order_last_departure; ///< When the vehicle last left the first order. TimerGameTick::TickCounter first_order_last_departure; ///< When the vehicle last left the first order.
TimerGameTick::Ticks first_order_round_trip_time; ///< How many ticks for a single circumnavigation of the orders. TimerGameTick::Ticks first_order_round_trip_time; ///< How many ticks for a single circumnavigation of the orders.
uint16_t service_interval; ///< The interval for (automatic) servicing; either in days or %. uint16_t service_interval; ///< The interval for (automatic) servicing; either in days or %.

2
src/saveload/vehicle_sl.cpp
View File

@@ -725,7 +725,7 @@ public:
SLE_CONDVAR(Vehicle, last_loading_tick, SLE_UINT64, SLV_LAST_LOADING_TICK, SL_MAX_VERSION), SLE_CONDVAR(Vehicle, last_loading_tick, SLE_UINT64, SLV_LAST_LOADING_TICK, SL_MAX_VERSION),
SLE_CONDVAR(Vehicle, lateness_counter, SLE_INT32, SLV_67, SL_MAX_VERSION), SLE_CONDVAR(Vehicle, lateness_counter, SLE_INT32, SLV_67, SL_MAX_VERSION),
SLE_CONDVAR(Vehicle, first_order_last_departure, SLE_INT32, SLV_AUTOMATIC_SEPARATION, SL_MAX_VERSION), SLE_CONDVAR(Vehicle, first_order_last_departure, SLE_UINT64, SLV_AUTOMATIC_SEPARATION, SL_MAX_VERSION),
SLE_CONDVAR(Vehicle, first_order_round_trip_time, SLE_INT32, SLV_AUTOMATIC_SEPARATION, SL_MAX_VERSION), SLE_CONDVAR(Vehicle, first_order_round_trip_time, SLE_INT32, SLV_AUTOMATIC_SEPARATION, SL_MAX_VERSION),
}; };
#if defined(_MSC_VER) && (_MSC_VER == 1915 || _MSC_VER == 1916) #if defined(_MSC_VER) && (_MSC_VER == 1915 || _MSC_VER == 1916)

15
src/vehicle.cpp
View File

@@ -771,7 +771,6 @@ void Vehicle::ShiftDates(TimerGameCalendar::Date interval)
this->date_of_last_service = std::max(this->date_of_last_service + interval, TimerGameCalendar::Date(0)); this->date_of_last_service = std::max(this->date_of_last_service + interval, TimerGameCalendar::Date(0));
/* date_of_last_service_newgrf is not updated here as it must stay stable /* date_of_last_service_newgrf is not updated here as it must stay stable
* for vehicles outside of a depot. */ * for vehicles outside of a depot. */
this->first_order_last_departure += interval.base() * Ticks::DAY_TICKS;
} }
/** /**
@@ -2371,8 +2370,7 @@ void Vehicle::HandleLoading(bool mode)
* it is ready to depart) * it is ready to depart)
*/ */
bool Vehicle::IsWaitingForAutomaticSeparation() const { bool Vehicle::IsWaitingForAutomaticSeparation() const {
TimerGameTick::Ticks now = (TimerGameCalendar::date.base() * Ticks::DAY_TICKS) + TimerGameCalendar::date_fract; return this->AutomaticSeparationIsEnabled() && this->first_order_last_departure > TimerGameTick::counter;
return this->AutomaticSeparationIsEnabled() && this->first_order_last_departure > now;
}; };
/** /**
@@ -2392,12 +2390,11 @@ void Vehicle::UpdateAutomaticSeparation()
if (this->cur_implicit_order_index != first_manual_order) return; if (this->cur_implicit_order_index != first_manual_order) return;
/* A "last departure" >= now means we've already calculated the separation */ /* A "last departure" >= now means we've already calculated the separation */
TimerGameTick::Ticks now = TimerGameCalendar::date.base() * Ticks::DAY_TICKS + TimerGameCalendar::date_fract; if (this->first_order_last_departure >= TimerGameTick::counter) return;
if (this->first_order_last_departure >= now) return;
/* Calculate round trip time from last departure and now - automatic separation waiting time is not included */ /* Calculate round trip time from last departure and now - automatic separation waiting time is not included */
if (this->first_order_last_departure > 0) { if (this->first_order_last_departure > 0) {
this->first_order_round_trip_time = now - this->first_order_last_departure; this->first_order_round_trip_time = TimerGameTick::counter - this->first_order_last_departure;
} }
/* To work out the automatic separation waiting time we need to know: /* To work out the automatic separation waiting time we need to know:
@@ -2406,7 +2403,7 @@ void Vehicle::UpdateAutomaticSeparation()
* - How many vehicles are currently operating the order list * - How many vehicles are currently operating the order list
* - How many vehicles are currently queuing for the first manual order * - How many vehicles are currently queuing for the first manual order
*/ */
TimerGameTick::Ticks last_departure = 0; TimerGameTick::TickCounter last_departure = 0;
TimerGameTick::Ticks round_trip_sum = 0; TimerGameTick::Ticks round_trip_sum = 0;
int round_trip_count = 0; int round_trip_count = 0;
int vehicles = 0; int vehicles = 0;
@@ -2447,12 +2444,12 @@ void Vehicle::UpdateAutomaticSeparation()
TimerGameTick::Ticks separation = std::max(1, vehicles > 0 ? round_trip_time * vehicles_moving_ratio / vehicles / vehicles : 1); TimerGameTick::Ticks separation = std::max(1, vehicles > 0 ? round_trip_time * vehicles_moving_ratio / vehicles / vehicles : 1);
/* Finally we can calculate when this vehicle should depart; if that's in the past, it'll depart right now */ /* Finally we can calculate when this vehicle should depart; if that's in the past, it'll depart right now */
this->first_order_last_departure = std::max(last_departure + separation, now); this->first_order_last_departure = std::max(last_departure + separation, TimerGameTick::counter);
/* Debug logging can be quite spammy as it prints a line every time a vehicle departs the first manual order */ /* Debug logging can be quite spammy as it prints a line every time a vehicle departs the first manual order */
if (_debug_misc_level >= 4) { if (_debug_misc_level >= 4) {
SetDParam(0, this->index); SetDParam(0, this->index);
Debug(misc, 4, "Orders for {}: RTT = {} [{:.2f} days, {} veh], separation = {} [{:.2f} days, {} veh, {} queuing] / gap = {} [{:.2f} days], wait = {} [{:.2f} days]", GetString(STR_VEHICLE_NAME), round_trip_time, (float)round_trip_time / Ticks::DAY_TICKS, round_trip_count, separation, (float)separation / Ticks::DAY_TICKS, vehicles, vehicles_queuing, now - last_departure, (float)(now - last_departure) / Ticks::DAY_TICKS, this->first_order_last_departure - now, (float)(this->first_order_last_departure - now) / Ticks::DAY_TICKS); Debug(misc, 4, "Orders for {}: RTT = {} [{:.2f} days, {} veh], separation = {} [{:.2f} days, {} veh, {} queuing] / gap = {} [{:.2f} days], wait = {} [{:.2f} days]", GetString(STR_VEHICLE_NAME), round_trip_time, (float)round_trip_time / Ticks::DAY_TICKS, round_trip_count, separation, (float)separation / Ticks::DAY_TICKS, vehicles, vehicles_queuing, TimerGameTick::counter - last_departure, (float)(TimerGameTick::counter - last_departure) / Ticks::DAY_TICKS, this->first_order_last_departure - TimerGameTick::counter, (float)(this->first_order_last_departure - TimerGameTick::counter) / Ticks::DAY_TICKS);
} }
} }