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

Enable economy day length scaling in wallclock timekeeping mode

Browse Source
This commit is contained in:
Jonathan G Rennison
2024-04-30 01:11:38 +01:00
parent 9a07f14f56
commit d90c540f9e
20 changed files with 177 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/graph_gui.cpp
View File

@@ -525,7 +525,7 @@ protected:
if (EconTime::UsingWallclockUnits()) {
auto *wid = this->GetWidget<NWidgetCore>(WID_GRAPH_FOOTER);
if (wid != nullptr) {
wid->SetDataTip(STR_GRAPH_LAST_72_MINUTES_TIME_LABEL, STR_NULL);
wid->SetDataTip((DayLengthFactor() > 1) ? STR_GRAPH_LAST_72_PRODUCTION_INTERVALS_TIME_LABEL : STR_GRAPH_LAST_72_MINUTES_TIME_LABEL, STR_NULL);
}
}
@@ -929,7 +929,7 @@ struct DeliveredCargoGraphWindow : ExcludingCargoBaseGraphWindow {
if (EconTime::UsingWallclockUnits()) {
auto *wid = this->GetWidget<NWidgetCore>(WID_GRAPH_FOOTER);
if (wid != nullptr) {
wid->SetDataTip(STR_GRAPH_LAST_72_MINUTES_TIME_LABEL, STR_NULL);
wid->SetDataTip((DayLengthFactor() > 1) ? STR_GRAPH_LAST_72_PRODUCTION_INTERVALS_TIME_LABEL : STR_GRAPH_LAST_72_MINUTES_TIME_LABEL, STR_NULL);
}
}
@@ -1301,6 +1301,8 @@ struct PaymentRatesGraphWindow : BaseGraphWindow {
}
val *= 74;
val /= _settings_time.ticks_per_minute;
} else if (EconTime::UsingWallclockUnits()) {
decimals = 0;
} else {
if ((10 % DayLengthFactor()) == 0) {
decimals = 0;
@@ -1897,7 +1899,7 @@ struct StationCargoGraphWindow final : BaseGraphWindow {
this->num_on_x_axis = MAX_STATION_CARGO_HISTORY_DAYS; // Four weeks
this->num_vert_lines = MAX_STATION_CARGO_HISTORY_DAYS;
this->draw_dates = false;
const uint16_t x_unit = EconTime::UsingWallclockUnits() ? 4 : 2;
const uint16_t x_unit = EconTime::UsingWallclockUnits() ? 4 * DayLengthFactor() : 2;
this->x_values_start = x_unit;
this->x_values_increment = x_unit;
@@ -1924,7 +1926,7 @@ struct StationCargoGraphWindow final : BaseGraphWindow {
}
if (widget == WID_GRAPH_FOOTER_CUSTOM) {
SetDParam(0, EconTime::UsingWallclockUnits() ? STR_GRAPH_STATION_CARGO_X_LABEL_SECONDS : STR_GRAPH_STATION_CARGO_X_LABEL_DAYS);
SetDParam(1, EconTime::UsingWallclockUnits() ? 96 : 48);
SetDParam(1, EconTime::UsingWallclockUnits() ? 96 * DayLengthFactor() : 48);
}
}