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

Split date types into calendar and economy dates

Browse Source 
See: 735abfe1
This commit is contained in:
Jonathan G Rennison
2024-02-13 21:34:09 +00:00
parent fad5ee56e7
commit 7ce06e22b8
141 changed files with 1325 additions and 1082 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/script/api/script_date.cpp
View File

@@ -25,7 +25,7 @@
/* static */ ScriptDate::Date ScriptDate::GetCurrentDate()
{
return (ScriptDate::Date)_date.base();
return (ScriptDate::Date)::CalTime::CurDate().base();
}
/* static */ SQInteger ScriptDate::GetDayLengthFactor()
@@ -37,15 +37,15 @@
{
if (date < 0) return DATE_INVALID;
::YearMonthDay ymd = ::ConvertDateToYMD(date);
return ymd.year;
::CalTime::YearMonthDay ymd = ::CalTime::ConvertDateToYMD(date);
return ymd.year.base();
}
/* static */ SQInteger ScriptDate::GetMonth(ScriptDate::Date date)
{
if (date < 0) return DATE_INVALID;
::YearMonthDay ymd = ::ConvertDateToYMD(date);
::CalTime::YearMonthDay ymd = ::CalTime::ConvertDateToYMD(date);
return ymd.month + 1;
}
@@ -53,7 +53,7 @@
{
if (date < 0) return DATE_INVALID;
::YearMonthDay ymd = ::ConvertDateToYMD(date);
::CalTime::YearMonthDay ymd = ::CalTime::ConvertDateToYMD(date);
return ymd.day;
}
@@ -61,9 +61,9 @@
{
if (month < 1 || month > 12) return DATE_INVALID;
if (day_of_month < 1 || day_of_month > 31) return DATE_INVALID;
if (year < 0 || year > MAX_YEAR) return DATE_INVALID;
if (year < 0 || year > CalTime::MAX_YEAR) return DATE_INVALID;
return (ScriptDate::Date)::ConvertYMDToDate(year, month - 1, day_of_month).base();
return (ScriptDate::Date)::CalTime::ConvertYMDToDate(year, month - 1, day_of_month).base();
}
/* static */ SQInteger ScriptDate::GetSystemTime()