diff --git a/src/openrct2-ui/windows/Finances.cpp b/src/openrct2-ui/windows/Finances.cpp index 3ac57609e7..fe3325e1de 100644 --- a/src/openrct2-ui/windows/Finances.cpp +++ b/src/openrct2-ui/windows/Finances.cpp @@ -27,7 +27,6 @@ #include #include -static constexpr const rct_string_id WINDOW_TITLE = STR_NONE; static constexpr const int32_t WH_SUMMARY = 309; static constexpr const int32_t WH_RESEARCH = 207; static constexpr const int32_t WH_OTHER_TABS = 257; @@ -96,7 +95,7 @@ enum static rct_widget _windowFinancesSummaryWidgets[] = { - WINDOW_SHIM(WINDOW_TITLE, WW_OTHER_TABS, WH_SUMMARY), + WINDOW_SHIM(STR_FINANCIAL_SUMMARY, WW_OTHER_TABS, WH_SUMMARY), { WWT_RESIZE, 1, 0, 529, 43, WH_SUMMARY - 1, 0xFFFFFFFF, STR_NONE }, TAB_WIDGETS, { WWT_SCROLL, 1, 130, 520, 50, 260, SCROLL_HORIZONTAL, STR_NONE }, @@ -106,7 +105,7 @@ static rct_widget _windowFinancesSummaryWidgets[] = static rct_widget _windowFinancesCashWidgets[] = { - WINDOW_SHIM(WINDOW_TITLE, WW_OTHER_TABS, WH_OTHER_TABS), + WINDOW_SHIM(STR_FINANCIAL_GRAPH, WW_OTHER_TABS, WH_OTHER_TABS), MakeWidget({0, 43}, {WW_OTHER_TABS, 214}, WWT_RESIZE, 1), TAB_WIDGETS, { WIDGETS_END }, @@ -114,7 +113,7 @@ static rct_widget _windowFinancesCashWidgets[] = static rct_widget _windowFinancesParkValueWidgets[] = { - WINDOW_SHIM(WINDOW_TITLE, WW_OTHER_TABS, WH_OTHER_TABS), + WINDOW_SHIM(STR_PARK_VALUE_GRAPH, WW_OTHER_TABS, WH_OTHER_TABS), MakeWidget({0, 43}, {WW_OTHER_TABS, 214}, WWT_RESIZE, 1), TAB_WIDGETS, { WIDGETS_END }, @@ -122,7 +121,7 @@ static rct_widget _windowFinancesParkValueWidgets[] = static rct_widget _windowFinancesProfitWidgets[] = { - WINDOW_SHIM(WINDOW_TITLE, WW_OTHER_TABS, WH_OTHER_TABS), + WINDOW_SHIM(STR_PROFIT_GRAPH, WW_OTHER_TABS, WH_OTHER_TABS), MakeWidget({0, 43}, {WW_OTHER_TABS, 214}, WWT_RESIZE, 1), TAB_WIDGETS, { WIDGETS_END }, @@ -130,7 +129,7 @@ static rct_widget _windowFinancesProfitWidgets[] = static rct_widget _windowFinancesMarketingWidgets[] = { - WINDOW_SHIM(WINDOW_TITLE, WW_OTHER_TABS, WH_OTHER_TABS), + WINDOW_SHIM(STR_MARKETING, WW_OTHER_TABS, WH_OTHER_TABS), MakeWidget({0, 43}, {WW_OTHER_TABS, 214}, WWT_RESIZE, 1), TAB_WIDGETS, MakeWidget({3, 47}, { WW_OTHER_TABS - 6, 45}, WWT_GROUPBOX, 2, STR_MARKETING_CAMPAIGNS_IN_OPERATION ), @@ -146,7 +145,7 @@ static rct_widget _windowFinancesMarketingWidgets[] = static rct_widget _windowFinancesResearchWidgets[] = { - WINDOW_SHIM(WINDOW_TITLE, WW_RESEARCH, WH_RESEARCH), + WINDOW_SHIM(STR_RESEARCH_FUNDING, WW_RESEARCH, WH_RESEARCH), MakeWidget({0, 43}, {WW_RESEARCH, 164}, WWT_RESIZE, 1), TAB_WIDGETS, MakeWidget({ 3, 47}, { WW_RESEARCH - 6, 45}, WWT_GROUPBOX, 2, STR_RESEARCH_FUNDING_ ), diff --git a/src/openrct2-ui/windows/Research.cpp b/src/openrct2-ui/windows/Research.cpp index ac84bf856a..efabfec98e 100644 --- a/src/openrct2-ui/windows/Research.cpp +++ b/src/openrct2-ui/windows/Research.cpp @@ -21,7 +21,6 @@ #include #include -static constexpr const rct_string_id WINDOW_TITLE = STR_NONE; static constexpr const int32_t WH_DEVELOPMENT = 196; static constexpr const int32_t WW_DEVELOPMENT = 300; static constexpr const int32_t WH_FUNDING = 207; @@ -62,7 +61,7 @@ enum { #pragma region Widgets static rct_widget window_research_development_widgets[] = { - WINDOW_SHIM(WINDOW_TITLE, WW_DEVELOPMENT, WH_DEVELOPMENT), + WINDOW_SHIM(STR_RESEARCH_AND_DEVELOPMENT, WW_DEVELOPMENT, WH_DEVELOPMENT), MakeWidget ({ 0, 43}, { WW_DEVELOPMENT, 153}, WWT_RESIZE, 1 ), MakeRemapWidget({ 3, 17}, { 31, 27}, WWT_TAB, 1, SPR_TAB, STR_RESEARCH_AND_DEVELOPMENT_TIP), MakeRemapWidget({ 34, 17}, { 31, 27}, WWT_TAB, 1, SPR_TAB, STR_FINANCES_RESEARCH_TIP ), @@ -73,7 +72,7 @@ static rct_widget window_research_development_widgets[] = { }; static rct_widget window_research_funding_widgets[] = { - WINDOW_SHIM(WINDOW_TITLE, WW_FUNDING, WH_FUNDING), + WINDOW_SHIM(STR_RESEARCH_FUNDING, WW_FUNDING, WH_FUNDING), MakeWidget ({ 0, 43}, { WW_FUNDING, 164}, WWT_RESIZE, 1 ), MakeRemapWidget({ 3, 17}, { 31, 27}, WWT_TAB, 1, SPR_TAB, STR_RESEARCH_AND_DEVELOPMENT_TIP ), MakeRemapWidget({ 34, 17}, { 31, 27}, WWT_TAB, 1, SPR_TAB, STR_FINANCES_RESEARCH_TIP ),