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

Adjust handling of year display in wallclock mode and company inauguration years

Browse Source 
See: #657
This commit is contained in:
Jonathan G Rennison
2024-02-24 23:35:20 +00:00
parent 1bfcbf823c
commit 090656bd7f
16 changed files with 75 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/date.cpp
View File

@@ -34,6 +34,8 @@ uint32_t _quit_after_days; ///< Quit after this many days of run
CalTime::State CalTime::Detail::now;
EconTime::State EconTime::Detail::now;
YearDelta EconTime::Detail::years_elapsed;
YearDelta EconTime::Detail::period_display_offset;
namespace DateDetail {
StateTicksDelta _state_ticks_offset; ///< Offset to add when calculating a StateTicks value from an economy date, date fract and tick skip counter
@@ -111,6 +113,11 @@ EconTime::State EconTime::Detail::NewState(EconTime::Year year)
return state;
}
int32_t EconTime::Detail::WallClockYearToDisplay(EconTime::Year year)
{
return (year + EconTime::Detail::period_display_offset).base();
}
StateTicks GetStateTicksFromDateWithoutOffset(EconTime::Date date, EconTime::DateFract date_fract)
{
return ((int64_t)(EconTime::DateToDateTicks(date, date_fract).base()) * DayLengthFactor()) + TickSkipCounter();
@@ -379,6 +386,7 @@ static void OnNewCalendarYear()
*/
static void OnNewEconomyYear()
{
EconTime::Detail::years_elapsed++;
CompaniesYearlyLoop();
VehiclesYearlyLoop();
TownsYearlyLoop();
@@ -386,6 +394,7 @@ static void OnNewEconomyYear()
/* check if we reached the maximum year, decrement dates by a year */
if (EconTime::CurYear() == EconTime::MAX_YEAR + 1) {
EconTime::Detail::period_display_offset++;
EconTime::Detail::now.econ_ymd.year--;
int days_this_year = EconTime::IsLeapYear(EconTime::Detail::now.econ_ymd.year) ? DAYS_IN_LEAP_YEAR : DAYS_IN_YEAR;
EconTime::Detail::now.econ_date -= days_this_year;