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

Run most "daily" vehicle tasks at a fixed frequency at day lengths >= 8

Browse Source 
This includes: running costs, track sharing costs, breakdown checks,
servicing checks, order checks
This commit is contained in:
Jonathan G Rennison
2021-11-27 15:51:49 +00:00
parent 1ff03f8ee9
commit ba65a5bab5
10 changed files with 66 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
src/vehicle.cpp
View File

@@ -1245,6 +1245,9 @@ template <typename T>
void CallVehicleOnNewDay(Vehicle *v)
{
T::From(v)->T::OnNewDay();
/* Vehicle::OnPeriodic is decoupled from Vehicle::OnNewDay at day lengths >= 8 */
if (_settings_game.economy.day_length_factor < 8) T::From(v)->T::OnPeriodic();
}
/**
@@ -1460,6 +1463,38 @@ void CallVehicleTicks()
if (_tick_skip_counter == 0) RunVehicleDayProc();
if (_settings_game.economy.day_length_factor >= 8 && _game_mode == GM_NORMAL) {
/*
* Vehicle::OnPeriodic is decoupled from Vehicle::OnNewDay at day lengths >= 8
* Use a fixed interval of 512 ticks (unscaled) instead
*/
Vehicle *v = nullptr;
SCOPE_INFO_FMT([&v], "CallVehicleTicks -> OnPeriodic: %s", scope_dumper().VehicleInfo(v));
for (size_t i = _scaled_tick_counter & 0x1FF; i < Vehicle::GetPoolSize(); i += 0x200) {
v = Vehicle::Get(i);
if (v == nullptr) continue;
/* This is called once per day for each vehicle, but not in the first tick of the day */
switch (v->type) {
case VEH_TRAIN:
Train::From(v)->Train::OnPeriodic();
break;
case VEH_ROAD:
RoadVehicle::From(v)->RoadVehicle::OnPeriodic();
break;
case VEH_SHIP:
Ship::From(v)->Ship::OnPeriodic();
break;
case VEH_AIRCRAFT:
Aircraft::From(v)->Aircraft::OnPeriodic();
break;
default:
break;
}
}
}
{
PerformanceMeasurer framerate(PFE_GL_ECONOMY);
Station *si_st = nullptr;