Archives/OpenTTD-patches
2
0
Fork 0
mirror of https://github.com/JGRennison/OpenTTD-patches.git synced 2024-11-13 07:10:57 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix vehicle window showing profit last year in wallclock timekeeping mode

Browse Source
This commit is contained in:
Jonathan G Rennison 2024-05-23 20:05:18 +01:00
parent 6dfe5c4da9
commit 1d70c781c6
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/vehicle_gui.cpp
View File

@ -3014,15 +3014,16 @@ struct VehicleDetailsWindow : Window {
for (uint i = 0; i < lengthof(info_strings); i++) { for (uint i = 0; i < lengthof(info_strings); i++) {
dim = maxdim(dim, GetStringBoundingBox(info_strings[i])); dim = maxdim(dim, GetStringBoundingBox(info_strings[i]));
} }
StringID last_year_profit_str = EconTime::UsingWallclockUnits() ? STR_VEHICLE_INFO_PROFIT_THIS_PERIOD_LAST_PERIOD : STR_VEHICLE_INFO_PROFIT_THIS_YEAR_LAST_YEAR;
if (v->type == VEH_TRAIN && _settings_client.gui.show_train_length_in_details) { if (v->type == VEH_TRAIN && _settings_client.gui.show_train_length_in_details) {
SetDParamMaxValue(0, _settings_game.vehicle.max_train_length * 10); SetDParamMaxValue(0, _settings_game.vehicle.max_train_length * 10);
SetDParam(1, 1); SetDParam(1, 1);
SetDParam(2, STR_VEHICLE_INFO_PROFIT_THIS_YEAR_LAST_YEAR_LIFETIME); SetDParam(2, STR_VEHICLE_INFO_PROFIT_THIS_YEAR_LAST_YEAR_LIFETIME);
SetDParam(3, STR_VEHICLE_INFO_PROFIT_THIS_YEAR_LAST_YEAR); SetDParam(3, last_year_profit_str);
for (uint i = 4; i < 7; i++) SetDParamMaxValue(i, 1 << 24); for (uint i = 4; i < 7; i++) SetDParamMaxValue(i, 1 << 24);
dim = maxdim(dim, GetStringBoundingBox(STR_VEHICLE_INFO_TRAIN_LENGTH)); dim = maxdim(dim, GetStringBoundingBox(STR_VEHICLE_INFO_TRAIN_LENGTH));
} else { } else {
SetDParam(0, STR_VEHICLE_INFO_PROFIT_THIS_YEAR_LAST_YEAR); SetDParam(0, last_year_profit_str);
for (uint i = 1; i < 4; i++) SetDParamMaxValue(i, 1 << 24); for (uint i = 1; i < 4; i++) SetDParamMaxValue(i, 1 << 24);
dim = maxdim(dim, GetStringBoundingBox(STR_VEHICLE_INFO_PROFIT_THIS_YEAR_LAST_YEAR_LIFETIME)); dim = maxdim(dim, GetStringBoundingBox(STR_VEHICLE_INFO_PROFIT_THIS_YEAR_LAST_YEAR_LIFETIME));
} }
@ -3210,18 +3211,19 @@ struct VehicleDetailsWindow : Window {
} }
/* Draw profit */ /* Draw profit */
StringID last_year_profit_str = EconTime::UsingWallclockUnits() ? STR_VEHICLE_INFO_PROFIT_THIS_PERIOD_LAST_PERIOD : STR_VEHICLE_INFO_PROFIT_THIS_YEAR_LAST_YEAR;
if (v->type == VEH_TRAIN && _settings_client.gui.show_train_length_in_details) { if (v->type == VEH_TRAIN && _settings_client.gui.show_train_length_in_details) {
const GroundVehicleCache *gcache = v->GetGroundVehicleCache(); const GroundVehicleCache *gcache = v->GetGroundVehicleCache();
SetDParam(0, CeilDiv(gcache->cached_total_length * 10, TILE_SIZE)); SetDParam(0, CeilDiv(gcache->cached_total_length * 10, TILE_SIZE));
SetDParam(1, 1); SetDParam(1, 1);
SetDParam(2, STR_VEHICLE_INFO_PROFIT_THIS_YEAR_LAST_YEAR_LIFETIME); SetDParam(2, STR_VEHICLE_INFO_PROFIT_THIS_YEAR_LAST_YEAR_LIFETIME);
SetDParam(3, STR_VEHICLE_INFO_PROFIT_THIS_YEAR_LAST_YEAR); SetDParam(3, last_year_profit_str);
SetDParam(4, v->GetDisplayProfitThisYear()); SetDParam(4, v->GetDisplayProfitThisYear());
SetDParam(5, v->GetDisplayProfitLastYear()); SetDParam(5, v->GetDisplayProfitLastYear());
SetDParam(6, v->GetDisplayProfitLifetime()); SetDParam(6, v->GetDisplayProfitLifetime());
DrawString(tr, STR_VEHICLE_INFO_TRAIN_LENGTH); DrawString(tr, STR_VEHICLE_INFO_TRAIN_LENGTH);
} else { } else {
SetDParam(0, STR_VEHICLE_INFO_PROFIT_THIS_YEAR_LAST_YEAR); SetDParam(0, last_year_profit_str);
SetDParam(1, v->GetDisplayProfitThisYear()); SetDParam(1, v->GetDisplayProfitThisYear());
SetDParam(2, v->GetDisplayProfitLastYear()); SetDParam(2, v->GetDisplayProfitLastYear());
SetDParam(3, v->GetDisplayProfitLifetime()); SetDParam(3, v->GetDisplayProfitLifetime());