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

20
src/graph_gui.cpp
View File

@@ -184,8 +184,8 @@ protected:
byte num_vert_lines;
/* The starting month and year that values are plotted against. */
byte month;
Year year;
EconTime::Month month;
EconTime::Year year;
bool draw_dates = true; ///< Should we draw months and years on the time axis?
@@ -395,8 +395,8 @@ protected:
if (this->draw_dates) {
x = r.left;
y = r.bottom + ScaleGUITrad(2);
byte month = this->month;
Year year = this->year;
EconTime::Month month = this->month;
EconTime::Year year = this->year;
for (int i = 0; i < this->num_on_x_axis; i++) {
SetDParam(0, month + STR_MONTH_ABBREV_JAN);
SetDParam(1, year);
@@ -518,8 +518,8 @@ public:
/* Draw x-axis labels and markings for graphs based on financial quarters and years. */
if (this->draw_dates) {
byte month = this->month;
Year year = this->year;
EconTime::Month month = this->month;
EconTime::Year year = this->year;
for (int i = 0; i < this->num_on_x_axis; i++) {
SetDParam(0, month + STR_MONTH_ABBREV_JAN);
SetDParam(1, year);
@@ -598,8 +598,8 @@ public:
nums = std::min(this->num_vert_lines, std::max(nums, c->num_valid_stat_ent));
}
int mo = (_cur_date_ymd.month / 3 - nums) * 3;
int yr = _cur_year;
int mo = (EconTime::CurMonth() / 3 - nums) * 3;
EconTime::Year yr = EconTime::CurYear();
while (mo < 0) {
yr--;
mo += 12;
@@ -950,8 +950,8 @@ struct DeliveredCargoGraphWindow : ExcludingCargoBaseGraphWindow {
nums = std::min(this->num_vert_lines, std::max(nums, c->num_valid_stat_ent));
}
int mo = (_cur_date_ymd.month / 3 - nums) * 3;
int yr = _cur_year;
int mo = (EconTime::CurMonth() / 3 - nums) * 3;
EconTime::Year yr = EconTime::CurYear();
while (mo < 0) {
yr--;
mo += 12;