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

Feature: Use real-time "wallclock" timekeeping units (#11341)

Browse Source
This commit is contained in:
Tyler Trahan
2024-01-23 11:36:09 -05:00
committed by GitHub
parent bbdbf9a589
commit fd9e72a7e7
30 changed files with 546 additions and 140 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/vehicle.cpp
View File

@@ -195,10 +195,17 @@ bool Vehicle::NeedsServicing() const
/* Are we ready for the next service cycle? */
const Company *c = Company::Get(this->owner);
if (this->ServiceIntervalIsPercent() ?
(this->reliability >= this->GetEngine()->reliability * (100 - this->GetServiceInterval()) / 100) :
(this->date_of_last_service + this->GetServiceInterval() >= TimerGameEconomy::date)) {
return false;
/* Service intervals can be measured in different units, which we handle individually. */
if (this->ServiceIntervalIsPercent()) {
/* Service interval is in percents. */
if (this->reliability >= this->GetEngine()->reliability * (100 - this->GetServiceInterval()) / 100) return false;
} else if (TimerGameEconomy::UsingWallclockUnits()) {
/* Service interval is in minutes. */
if (this->date_of_last_service + (this->GetServiceInterval() * EconomyTime::DAYS_IN_ECONOMY_MONTH) >= TimerGameEconomy::date) return false;
} else {
/* Service interval is in days. */
if (this->date_of_last_service + this->GetServiceInterval() >= TimerGameEconomy::date) return false;
}
/* If we're servicing anyway, because we have not disabled servicing when