mirror
/
OpenTTD
mirror of https://github.com/OpenTTD/OpenTTD
1
0
Fork 0
Code Issues

Revert "Added SetDParam for economic Inauguration Year back in so both economic and calendar inauguration years can be visible" 

-m "Made mistake in editing translation files"

This reverts commit 95c9770dc6b1532f0e392931684ac10c59f7f7d2.
pull/12769/head
Kaiden Joy 2024-06-16 23:58:59 -04:00
parent c559c98bda
commit 52bf41a956
3 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/company_base.h
View File

@ -92,7 +92,7 @@ struct CompanyProperties {
TileIndex last_build_coordinate; ///< Coordinate of the last build thing by this company.
TimerGameEconomy::Year inaugurated_year; ///< Economy year of starting the company.
TimerGameCalendar::Year inaugurated_year_calendar; ///< Calendar year of starting the company. Used for when we need to display an actual Inaguration Year while in Wallclock mode.
TimerGameCalendar::Year inaugurated_year_calendar; ///< Calendar year of starting the company. Used for when we need to display an actual Inauguration Year while in Wallclock mode.
uint8_t months_empty = 0; ///< NOSAVE: Number of months this company has not had a client in multiplayer.
uint8_t months_of_bankruptcy; ///< Number of months that the company is unable to pay its debts

13
src/company_gui.cpp
View File

@ -2237,6 +2237,10 @@ struct CompanyWindow : Window
}
}
if (TimerGameEconomy::UsingWallclockUnits()) {
this->GetWidget<NWidgetLeaf>(WID_C_DESC_INAUGURATION)->SetDataTip(STR_COMPANY_VIEW_INAUGURATED_TITLE_WALLCLOCK, STR_NULL);
}
this->DrawWidgets();
}
@ -2400,9 +2404,12 @@ struct CompanyWindow : Window
SetDParam(1, (CompanyID)this->window_number);
break;
case WID_C_DESC_INAUGURATION:
SetDParam(0, Company::Get((CompanyID) this->window_number)->inaugurated_year_calendar);
SetDParam(1, Company::Get((CompanyID) this->window_number)->inaugurated_year);
case WID_C_DESC_INAUGURATION:
if (TimerGameEconomy::UsingWallclockUnits()) {
SetDParam(0, Company::Get((CompanyID) this->window_number)->inaugurated_year_calendar);
SetDParam(1, Company::Get((CompanyID) this->window_number)->inaugurated_year);
}
else SetDParam(0, Company::Get((CompanyID) this->window_number)->inaugurated_year);
break;
case WID_C_DESC_COMPANY_VALUE:

3
src/lang/english.txt
View File

@ -3889,7 +3889,8 @@ STR_FINANCES_INFRASTRUCTURE_BUTTON :{BLACK}Infrastr
STR_COMPANY_VIEW_CAPTION :{WHITE}{COMPANY} {BLACK}{COMPANY_NUM}
STR_COMPANY_VIEW_PRESIDENT_MANAGER_TITLE :{WHITE}{PRESIDENT_NAME}{}{GOLD}(Manager)
STR_COMPANY_VIEW_INAUGURATED_TITLE :{GOLD}Inaugurated: {WHITE}{NUM} (period {NUM})
STR_COMPANY_VIEW_INAUGURATED_TITLE :{GOLD}Inaugurated: {WHITE}{NUM}
STR_COMPANY_VIEW_INAUGURATED_TITLE_WALLCLOCK :{GOLD}Inaugurated: {WHITE}{NUM} (period {NUM})
STR_COMPANY_VIEW_COLOUR_SCHEME_TITLE :{GOLD}Colour Scheme:
STR_COMPANY_VIEW_VEHICLES_TITLE :{GOLD}Vehicles:
STR_COMPANY_VIEW_TRAINS :{WHITE}{COMMA} train{P "" s}