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

Codechange: Added Comments, fixed code style, added highlights to HQ and owned lands (MP_objects) and Airports and stations (MP_stations)

pull/12164/head
Anthony Lazar 2024-07-01 00:34:03 -04:00
parent 945561ada8
commit 7530529653
5 changed files with 23 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/company_gui.cpp
View File

@ -1818,8 +1818,8 @@ static constexpr NWidgetPart _nested_company_infrastructure_widgets[] = {
NWidget(WWT_EMPTY, COLOUR_GREY, WID_CI_TOTAL_DESC), SetFill(1, 0), NWidget(WWT_EMPTY, COLOUR_GREY, WID_CI_TOTAL_DESC), SetFill(1, 0),
NWidget(WWT_EMPTY, COLOUR_GREY, WID_CI_TOTAL), SetFill(0, 1), NWidget(WWT_EMPTY, COLOUR_GREY, WID_CI_TOTAL), SetFill(0, 1),
EndContainer(), EndContainer(),
NWidget(WWT_PUSHTXTBTN, COLOUR_GREY, WID_CI_HIGHLIGHT_INFRASTRUCTURE), SetFill(1, 0), SetDataTip(STR_COMPANY_INFRASTRUCTURE_VIEW_HIGHLIGHT_INFRASTRUCTURE, STR_COMPANY_INFRASTRUCTURE_VIEW_HIGHLIGHT_INFRASTRUCTURE_TOOLTIP),
EndContainer(), EndContainer(),
NWidget(WWT_PUSHTXTBTN, COLOUR_GREY, WID_CI_HIGHLIGHT_INFRASTRUCTURE), SetFill(1, 0), SetDataTip(STR_COMPANY_INFRASTRUCTURE_VIEW_HIGHLIGHT_INFRASTRUCTURE, STR_COMPANY_INFRASTRUCTURE_VIEW_HIGHLIGHT_INFRASTRUCTURE_TOOLTIP),
EndContainer(), EndContainer(),
}; };
@ -1839,7 +1839,7 @@ struct CompanyInfrastructureWindow : Window
*/ */
void Close([[maybe_unused]] int data) override void Close([[maybe_unused]] int data) override
{ {
/* Clear highlights if the infrastructure window is closed */
if (_viewport_company_to_highlight_infrastructure == (CompanyID)this->window_number) { if (_viewport_company_to_highlight_infrastructure == (CompanyID)this->window_number) {
_viewport_company_to_highlight_infrastructure = INVALID_OWNER; _viewport_company_to_highlight_infrastructure = INVALID_OWNER;
MarkWholeScreenDirty(); MarkWholeScreenDirty();
@ -2043,11 +2043,13 @@ struct CompanyInfrastructureWindow : Window
TC_FROMSTRING, SA_RIGHT); TC_FROMSTRING, SA_RIGHT);
} }
} }
void OnPaint() override void OnPaint() override
{ {
this->SetWidgetLoweredState(WID_CI_HIGHLIGHT_INFRASTRUCTURE, _viewport_company_to_highlight_infrastructure == (CompanyID)this->window_number); this->SetWidgetLoweredState(WID_CI_HIGHLIGHT_INFRASTRUCTURE, _viewport_company_to_highlight_infrastructure == (CompanyID)this->window_number);
this->DrawWidgets(); this->DrawWidgets();
} }
void DrawWidget(const Rect &r, WidgetID widget) const override void DrawWidget(const Rect &r, WidgetID widget) const override
{ {
const Company *c = Company::Get((CompanyID)this->window_number); const Company *c = Company::Get((CompanyID)this->window_number);
@ -2146,21 +2148,22 @@ struct CompanyInfrastructureWindow : Window
break; break;
} }
} }
void OnClick([[maybe_unused]] Point pt, WidgetID widget, [[maybe_unused]] int click_count) override void OnClick([[maybe_unused]] Point pt, WidgetID widget, [[maybe_unused]] int click_count) override
{ {
switch (widget) { if (widget != WID_CI_HIGHLIGHT_INFRASTRUCTURE) return;
case WID_CI_HIGHLIGHT_INFRASTRUCTURE:
/* Toggle between highlight and clear */
CompanyID window_company_id = (CompanyID)this->window_number; CompanyID window_company_id = (CompanyID)this->window_number;
if(_viewport_company_to_highlight_infrastructure != window_company_id) { if(_viewport_company_to_highlight_infrastructure != window_company_id) {
/* highlight tiles of this company */
_viewport_company_to_highlight_infrastructure = window_company_id; _viewport_company_to_highlight_infrastructure = window_company_id;
MarkWholeScreenDirty(); MarkWholeScreenDirty();
} } else {
else { /* Clear tile highlights */
_viewport_company_to_highlight_infrastructure = INVALID_OWNER; _viewport_company_to_highlight_infrastructure = INVALID_OWNER;
MarkWholeScreenDirty(); MarkWholeScreenDirty();
} }
break;
}
} }
/** /**
@ -2186,15 +2189,12 @@ static WindowDesc _company_infrastructure_desc(__FILE__, __LINE__,
/** /**
* Open the infrastructure window of a company. * Open the infrastructure window of a company.
* Signal to the viewport to highlight company owned infrastructure
* @param company Company to show infrastructure of. * @param company Company to show infrastructure of.
*/ */
static void ShowCompanyInfrastructure(CompanyID company) static void ShowCompanyInfrastructure(CompanyID company)
{ {
if (!Company::IsValidID(company)) return; if (!Company::IsValidID(company)) return;
AllocateWindowDescFront<CompanyInfrastructureWindow>(&_company_infrastructure_desc, company); AllocateWindowDescFront<CompanyInfrastructureWindow>(&_company_infrastructure_desc, company);
MarkWholeScreenDirty();
} }
static constexpr NWidgetPart _nested_company_widgets[] = { static constexpr NWidgetPart _nested_company_widgets[] = {

2
src/lang/english.txt
View File

@ -3934,7 +3934,7 @@ STR_COMPANY_INFRASTRUCTURE_VIEW_AIRPORTS :{WHITE}Airports
STR_COMPANY_INFRASTRUCTURE_VIEW_TOTAL_YEAR :{WHITE}{CURRENCY_LONG}/year STR_COMPANY_INFRASTRUCTURE_VIEW_TOTAL_YEAR :{WHITE}{CURRENCY_LONG}/year
STR_COMPANY_INFRASTRUCTURE_VIEW_TOTAL_PERIOD :{WHITE}{CURRENCY_LONG}/period STR_COMPANY_INFRASTRUCTURE_VIEW_TOTAL_PERIOD :{WHITE}{CURRENCY_LONG}/period
STR_COMPANY_INFRASTRUCTURE_VIEW_HIGHLIGHT_INFRASTRUCTURE :{BLACK}Highlight infrastructure STR_COMPANY_INFRASTRUCTURE_VIEW_HIGHLIGHT_INFRASTRUCTURE :{BLACK}Highlight infrastructure
STR_COMPANY_INFRASTRUCTURE_VIEW_HIGHLIGHT_INFRASTRUCTURE_TOOLTIP:{BLACK}Highlight all infrastructure tiles the company currently owns STR_COMPANY_INFRASTRUCTURE_VIEW_HIGHLIGHT_INFRASTRUCTURE_TOOLTIP:{BLACK}Highlight all infrastructure tiles owned by this company
# Industry directory # Industry directory
STR_INDUSTRY_DIRECTORY_CAPTION :{WHITE}Industries STR_INDUSTRY_DIRECTORY_CAPTION :{WHITE}Industries

2
src/lang/english_US.txt
View File

@ -3930,8 +3930,6 @@ STR_COMPANY_INFRASTRUCTURE_VIEW_STATIONS :{WHITE}Station
STR_COMPANY_INFRASTRUCTURE_VIEW_AIRPORTS :{WHITE}Airports STR_COMPANY_INFRASTRUCTURE_VIEW_AIRPORTS :{WHITE}Airports
STR_COMPANY_INFRASTRUCTURE_VIEW_TOTAL_YEAR :{WHITE}{CURRENCY_LONG}/year STR_COMPANY_INFRASTRUCTURE_VIEW_TOTAL_YEAR :{WHITE}{CURRENCY_LONG}/year
STR_COMPANY_INFRASTRUCTURE_VIEW_TOTAL_PERIOD :{WHITE}{CURRENCY_LONG}/period STR_COMPANY_INFRASTRUCTURE_VIEW_TOTAL_PERIOD :{WHITE}{CURRENCY_LONG}/period
STR_COMPANY_INFRASTRUCTURE_VIEW_HIGHLIGHT_INFRASTRUCTURE :{BLACK}Highlight infrastructure
STR_COMPANY_INFRASTRUCTURE_VIEW_HIGHLIGHT_INFRASTRUCTURE_TOOLTIP:{BLACK}Highlight all infrastructure tiles the company currently owns
# Industry directory # Industry directory
STR_INDUSTRY_DIRECTORY_CAPTION :{WHITE}Industries STR_INDUSTRY_DIRECTORY_CAPTION :{WHITE}Industries

4
src/viewport.cpp
View File

@ -1038,7 +1038,7 @@ static TileHighlightType GetTileHighlightType(TileIndex t)
} }
} }
/* Highlight infrastructure owned by the company with the most recently currently opened infrastructure window */ /* Highlight infrastructure of selected company */
if (_viewport_company_to_highlight_infrastructure != INVALID_OWNER) { if (_viewport_company_to_highlight_infrastructure != INVALID_OWNER) {
switch (GetTileType(t)) { switch (GetTileType(t)) {
case MP_ROAD: case MP_ROAD:
@ -1059,6 +1059,8 @@ static TileHighlightType GetTileHighlightType(TileIndex t)
case MP_RAILWAY: case MP_RAILWAY:
case MP_TUNNELBRIDGE: case MP_TUNNELBRIDGE:
case MP_WATER: case MP_WATER:
case MP_STATION:
case MP_OBJECT:
if (GetTileOwner(t) == _viewport_company_to_highlight_infrastructure) { if (GetTileOwner(t) == _viewport_company_to_highlight_infrastructure) {
return THT_WHITE; return THT_WHITE;
} }

2
src/widgets/company_widget.h
View File

@ -184,7 +184,7 @@ enum CompanyInfrastructureWidgets : WidgetID {
WID_CI_STATION_COUNT, ///< Count of station. WID_CI_STATION_COUNT, ///< Count of station.
WID_CI_TOTAL_DESC, ///< Description of total. WID_CI_TOTAL_DESC, ///< Description of total.
WID_CI_TOTAL, ///< Count of total. WID_CI_TOTAL, ///< Count of total.
WID_CI_HIGHLIGHT_INFRASTRUCTURE, WID_CI_HIGHLIGHT_INFRASTRUCTURE, ///< Button to highlight infrastructure of this company.
}; };
/** Widgets of the #BuyCompanyWindow class. */ /** Widgets of the #BuyCompanyWindow class. */