From 3dd98c7aa2d804e0ce727353937670f8796bc3e5 Mon Sep 17 00:00:00 2001 From: Hielke Morsink Date: Thu, 4 Jan 2018 04:43:34 +0100 Subject: [PATCH] Apply coding style --- src/openrct2-ui/windows/Finances.cpp | 157 +++++++++++++++------------ 1 file changed, 89 insertions(+), 68 deletions(-) diff --git a/src/openrct2-ui/windows/Finances.cpp b/src/openrct2-ui/windows/Finances.cpp index e1935afee9..445e510be5 100644 --- a/src/openrct2-ui/windows/Finances.cpp +++ b/src/openrct2-ui/windows/Finances.cpp @@ -27,7 +27,8 @@ #include #include -enum { +enum +{ WINDOW_FINANCES_PAGE_SUMMARY, WINDOW_FINANCES_PAGE_FINANCIAL_GRAPH, WINDOW_FINANCES_PAGE_VALUE_GRAPH, @@ -37,7 +38,8 @@ enum { WINDOW_FINANCES_PAGE_COUNT }; -enum { +enum +{ WIDX_BACKGROUND, WIDX_TITLE, WIDX_CLOSE, @@ -87,7 +89,8 @@ enum { { WWT_TAB, 1, 127, 157, 17, 43, IMAGE_TYPE_REMAP | SPR_TAB, STR_FINANCES_SHOW_MARKETING_TAB_TIP }, \ { WWT_TAB, 1, 158, 188, 17, 43, IMAGE_TYPE_REMAP | SPR_TAB, STR_FINANCES_RESEARCH_TIP } -static rct_widget window_finances_summary_widgets[] = { +static rct_widget _windowFinancesSummaryWidgets[] = +{ MAIN_WIDGETS, { WWT_SPINNER, 1, 64, 153, 259, 270, STR_FINANCES_SUMMARY_LOAN_VALUE, STR_NONE }, { WWT_DROPDOWN_BUTTON, 1, 142, 152, 260, 264, STR_NUMERIC_UP, STR_NONE }, @@ -95,22 +98,26 @@ static rct_widget window_finances_summary_widgets[] = { { WIDGETS_END }, }; -static rct_widget window_finances_cash_widgets[] = { +static rct_widget _windowFinancesCashWidgets[] = +{ MAIN_WIDGETS, { WIDGETS_END }, }; -static rct_widget window_finances_park_value_widgets[] = { +static rct_widget _windowFinancesParkValueWidgets[] = +{ MAIN_WIDGETS, { WIDGETS_END }, }; -static rct_widget window_finances_profit_widgets[] = { +static rct_widget _windowFinancesProfitWidgets[] = +{ MAIN_WIDGETS, { WIDGETS_END }, }; -static rct_widget window_finances_marketing_widgets[] = { +static rct_widget _windowFinancesMarketingWidgets[] = +{ MAIN_WIDGETS, { WWT_GROUPBOX, 2, 3, 526, 47, 91, STR_MARKETING_CAMPAIGNS_IN_OPERATION, STR_NONE }, { WWT_GROUPBOX, 2, 3, 526, 47, 252, STR_MARKETING_CAMPAIGNS_AVAILABLE, STR_NONE }, @@ -123,7 +130,8 @@ static rct_widget window_finances_marketing_widgets[] = { { WIDGETS_END }, }; -static rct_widget window_finances_research_widgets[] = { +static rct_widget _windowFinancesResearchWidgets[] = +{ MAIN_WIDGETS, { WWT_GROUPBOX, 2, 3, 316, 47, 91, STR_RESEARCH_FUNDING_, STR_NONE }, { WWT_DROPDOWN, 2, 8, 167, 59, 70, 0xFFFFFFFF, STR_SELECT_LEVEL_OF_RESEARCH_AND_DEVELOPMENT }, @@ -139,13 +147,14 @@ static rct_widget window_finances_research_widgets[] = { { WIDGETS_END }, }; -static rct_widget *window_finances_page_widgets[] = { - window_finances_summary_widgets, - window_finances_cash_widgets, - window_finances_park_value_widgets, - window_finances_profit_widgets, - window_finances_marketing_widgets, - window_finances_research_widgets +static rct_widget *_windowFinancesPageWidgets[] = +{ + _windowFinancesSummaryWidgets, + _windowFinancesCashWidgets, + _windowFinancesParkValueWidgets, + _windowFinancesProfitWidgets, + _windowFinancesMarketingWidgets, + _windowFinancesResearchWidgets }; #pragma endregion @@ -186,7 +195,8 @@ static void window_finances_research_invalidate(rct_window *w); static void window_finances_research_paint(rct_window *w, rct_drawpixelinfo *dpi); // 0x00988EB8 -static rct_window_event_list window_finances_summary_events = { +static rct_window_event_list _windowFinancesSummaryEvents = +{ nullptr, window_finances_summary_mouseup, nullptr, @@ -218,7 +228,8 @@ static rct_window_event_list window_finances_summary_events = { }; // 0x00988F28 -static rct_window_event_list window_finances_financial_graph_events = { +static rct_window_event_list _windowFinancesFinancialGraphEvents = +{ nullptr, window_finances_financial_graph_mouseup, nullptr, @@ -250,7 +261,8 @@ static rct_window_event_list window_finances_financial_graph_events = { }; // 0x00988F98 -static rct_window_event_list window_finances_value_graph_events = { +static rct_window_event_list _windowFinancesValueGraphEvents = +{ nullptr, window_finances_park_value_graph_mouseup, nullptr, @@ -282,7 +294,8 @@ static rct_window_event_list window_finances_value_graph_events = { }; // 0x00989008 -static rct_window_event_list window_finances_profit_graph_events = { +static rct_window_event_list _windowFinancesProfitGraphEvents = +{ nullptr, window_finances_profit_graph_mouseup, nullptr, @@ -314,7 +327,8 @@ static rct_window_event_list window_finances_profit_graph_events = { }; // 0x00989078 -static rct_window_event_list window_finances_marketing_events = { +static rct_window_event_list _windowFinancesMarketingEvents = +{ nullptr, window_finances_marketing_mouseup, nullptr, @@ -346,7 +360,8 @@ static rct_window_event_list window_finances_marketing_events = { }; // 0x009890E8 -static rct_window_event_list window_finances_research_events = { +static rct_window_event_list _windowFinancesResearchEvents = +{ nullptr, window_finances_research_mouseup, nullptr, @@ -377,13 +392,14 @@ static rct_window_event_list window_finances_research_events = { nullptr }; -static rct_window_event_list *window_finances_page_events[] = { - &window_finances_summary_events, - &window_finances_financial_graph_events, - &window_finances_value_graph_events, - &window_finances_profit_graph_events, - &window_finances_marketing_events, - &window_finances_research_events +static rct_window_event_list *const _windowFinancesPageEvents[] = +{ + &_windowFinancesSummaryEvents, + &_windowFinancesFinancialGraphEvents, + &_windowFinancesValueGraphEvents, + &_windowFinancesProfitGraphEvents, + &_windowFinancesMarketingEvents, + &_windowFinancesResearchEvents }; #pragma endregion @@ -399,7 +415,8 @@ static rct_window_event_list *window_finances_page_events[] = { (1ULL << WIDX_TAB_5) | \ (1ULL << WIDX_TAB_6)) -static uint32 window_finances_page_enabled_widgets[] = { +static const uint32 WindowFinancesPageEnabledWidgets[] = +{ ALWAYS_ENABLED_WIDGETS | (1ULL << WIDX_LOAN_INCREASE) | (1ULL << WIDX_LOAN_DECREASE), @@ -430,7 +447,8 @@ static uint32 window_finances_page_enabled_widgets[] = { (1ULL << WIDX_SCENERY_AND_THEMING) }; -static uint32 window_finances_page_hold_down_widgets[] = { +static const uint32 WindowFinancesPageHoldDownWidgets[] = +{ (1ULL << WIDX_LOAN_INCREASE) | (1ULL << WIDX_LOAN_DECREASE), @@ -443,7 +461,10 @@ static uint32 window_finances_page_hold_down_widgets[] = { #pragma endregion -const sint32 window_finances_tab_animation_loops[] = { 16, 32, 32, 32, 38, 16 }; +static const sint32 WindowFinancesTabAnimationLoops[] = +{ + 16, 32, 32, 32, 38, 16 +}; static const rct_string_id window_finances_summary_row_labels[RCT_EXPENDITURE_TYPE_COUNT] = { STR_FINANCES_SUMMARY_RIDE_CONSTRUCTION, @@ -476,7 +497,7 @@ rct_window * window_finances_open() w = window_bring_to_front_by_class(WC_FINANCES); if (w == nullptr) { - w = window_create_auto_pos(530, 290, window_finances_page_events[0], WC_FINANCES, WF_10); + w = window_create_auto_pos(530, 290, _windowFinancesPageEvents[0], WC_FINANCES, WF_10); w->number = 0; w->frame_no = 0; @@ -489,10 +510,10 @@ rct_window * window_finances_open() w->height = 290; window_invalidate(w); - w->widgets = window_finances_page_widgets[WINDOW_FINANCES_PAGE_SUMMARY]; - w->enabled_widgets = window_finances_page_enabled_widgets[WINDOW_FINANCES_PAGE_SUMMARY]; - w->hold_down_widgets = window_finances_page_hold_down_widgets[WINDOW_FINANCES_PAGE_SUMMARY]; - w->event_handlers = window_finances_page_events[WINDOW_FINANCES_PAGE_SUMMARY]; + w->widgets = _windowFinancesPageWidgets[WINDOW_FINANCES_PAGE_SUMMARY]; + w->enabled_widgets = WindowFinancesPageEnabledWidgets[WINDOW_FINANCES_PAGE_SUMMARY]; + w->hold_down_widgets = WindowFinancesPageHoldDownWidgets[WINDOW_FINANCES_PAGE_SUMMARY]; + w->event_handlers = _windowFinancesPageEvents[WINDOW_FINANCES_PAGE_SUMMARY]; w->pressed_widgets = 0; w->disabled_widgets = 0; window_init_scroll_widgets(w); @@ -561,7 +582,7 @@ static void window_finances_summary_mousedown(rct_window *w, rct_widgetindex wid static void window_finances_summary_update(rct_window *w) { // Tab animation - if (++w->frame_no >= window_finances_tab_animation_loops[w->page]) + if (++w->frame_no >= WindowFinancesTabAnimationLoops[w->page]) w->frame_no = 0; widget_invalidate(w, WIDX_TAB_1); } @@ -572,8 +593,8 @@ static void window_finances_summary_update(rct_window *w) */ static void window_finances_summary_invalidate(rct_window *w) { - if (w->widgets != window_finances_page_widgets[WINDOW_FINANCES_PAGE_SUMMARY]) { - w->widgets = window_finances_page_widgets[WINDOW_FINANCES_PAGE_SUMMARY]; + if (w->widgets != _windowFinancesPageWidgets[WINDOW_FINANCES_PAGE_SUMMARY]) { + w->widgets = _windowFinancesPageWidgets[WINDOW_FINANCES_PAGE_SUMMARY]; window_init_scroll_widgets(w); } @@ -714,7 +735,7 @@ static void window_finances_financial_graph_mouseup(rct_window *w, rct_widgetind static void window_finances_financial_graph_update(rct_window *w) { // Tab animation - if (++w->frame_no >= window_finances_tab_animation_loops[w->page]) + if (++w->frame_no >= WindowFinancesTabAnimationLoops[w->page]) w->frame_no = 0; widget_invalidate(w, WIDX_TAB_2); } @@ -725,8 +746,8 @@ static void window_finances_financial_graph_update(rct_window *w) */ static void window_finances_financial_graph_invalidate(rct_window *w) { - if (w->widgets != window_finances_page_widgets[WINDOW_FINANCES_PAGE_FINANCIAL_GRAPH]) { - w->widgets = window_finances_page_widgets[WINDOW_FINANCES_PAGE_FINANCIAL_GRAPH]; + if (w->widgets != _windowFinancesPageWidgets[WINDOW_FINANCES_PAGE_FINANCIAL_GRAPH]) { + w->widgets = _windowFinancesPageWidgets[WINDOW_FINANCES_PAGE_FINANCIAL_GRAPH]; window_init_scroll_widgets(w); } @@ -744,7 +765,7 @@ static void window_finances_financial_graph_paint(rct_window *w, rct_drawpixelin window_draw_widgets(w, dpi); window_finances_draw_tab_images(dpi, w); - rct_widget *pageWidget = &window_finances_cash_widgets[WIDX_PAGE_BACKGROUND]; + rct_widget *pageWidget = &_windowFinancesCashWidgets[WIDX_PAGE_BACKGROUND]; graphLeft = w->x + pageWidget->left + 4; graphTop = w->y + pageWidget->top + 15; graphRight = w->x + pageWidget->right - 4; @@ -820,7 +841,7 @@ static void window_finances_park_value_graph_mouseup(rct_window *w, rct_widgetin static void window_finances_park_value_graph_update(rct_window *w) { // Tab animation - if (++w->frame_no >= window_finances_tab_animation_loops[w->page]) + if (++w->frame_no >= WindowFinancesTabAnimationLoops[w->page]) w->frame_no = 0; widget_invalidate(w, WIDX_TAB_2); } @@ -831,8 +852,8 @@ static void window_finances_park_value_graph_update(rct_window *w) */ static void window_finances_park_value_graph_invalidate(rct_window *w) { - if (w->widgets != window_finances_page_widgets[WINDOW_FINANCES_PAGE_VALUE_GRAPH]) { - w->widgets = window_finances_page_widgets[WINDOW_FINANCES_PAGE_VALUE_GRAPH]; + if (w->widgets != _windowFinancesPageWidgets[WINDOW_FINANCES_PAGE_VALUE_GRAPH]) { + w->widgets = _windowFinancesPageWidgets[WINDOW_FINANCES_PAGE_VALUE_GRAPH]; window_init_scroll_widgets(w); } @@ -850,7 +871,7 @@ static void window_finances_park_value_graph_paint(rct_window *w, rct_drawpixeli window_draw_widgets(w, dpi); window_finances_draw_tab_images(dpi, w); - rct_widget *pageWidget = &window_finances_cash_widgets[WIDX_PAGE_BACKGROUND]; + rct_widget *pageWidget = &_windowFinancesCashWidgets[WIDX_PAGE_BACKGROUND]; graphLeft = w->x + pageWidget->left + 4; graphTop = w->y + pageWidget->top + 15; graphRight = w->x + pageWidget->right - 4; @@ -924,7 +945,7 @@ static void window_finances_profit_graph_mouseup(rct_window *w, rct_widgetindex static void window_finances_profit_graph_update(rct_window *w) { // Tab animation - if (++w->frame_no >= window_finances_tab_animation_loops[w->page]) + if (++w->frame_no >= WindowFinancesTabAnimationLoops[w->page]) w->frame_no = 0; widget_invalidate(w, WIDX_TAB_2); } @@ -935,8 +956,8 @@ static void window_finances_profit_graph_update(rct_window *w) */ static void window_finances_profit_graph_invalidate(rct_window *w) { - if (w->widgets != window_finances_page_widgets[WINDOW_FINANCES_PAGE_PROFIT_GRAPH]) { - w->widgets = window_finances_page_widgets[WINDOW_FINANCES_PAGE_PROFIT_GRAPH]; + if (w->widgets != _windowFinancesPageWidgets[WINDOW_FINANCES_PAGE_PROFIT_GRAPH]) { + w->widgets = _windowFinancesPageWidgets[WINDOW_FINANCES_PAGE_PROFIT_GRAPH]; window_init_scroll_widgets(w); } @@ -954,7 +975,7 @@ static void window_finances_profit_graph_paint(rct_window *w, rct_drawpixelinfo window_draw_widgets(w, dpi); window_finances_draw_tab_images(dpi, w); - rct_widget *pageWidget = &window_finances_cash_widgets[WIDX_PAGE_BACKGROUND]; + rct_widget *pageWidget = &_windowFinancesCashWidgets[WIDX_PAGE_BACKGROUND]; graphLeft = w->x + pageWidget->left + 4; graphTop = w->y + pageWidget->top + 15; graphRight = w->x + pageWidget->right - 4; @@ -1031,7 +1052,7 @@ static void window_finances_marketing_mouseup(rct_window *w, rct_widgetindex wid static void window_finances_marketing_update(rct_window *w) { // Tab animation - if (++w->frame_no >= window_finances_tab_animation_loops[w->page]) + if (++w->frame_no >= WindowFinancesTabAnimationLoops[w->page]) w->frame_no = 0; widget_invalidate(w, WIDX_TAB_5); } @@ -1044,8 +1065,8 @@ static void window_finances_marketing_invalidate(rct_window *w) { sint32 i; - if (w->widgets != window_finances_page_widgets[WINDOW_FINANCES_PAGE_MARKETING]) { - w->widgets = window_finances_page_widgets[WINDOW_FINANCES_PAGE_MARKETING]; + if (w->widgets != _windowFinancesPageWidgets[WINDOW_FINANCES_PAGE_MARKETING]) { + w->widgets = _windowFinancesPageWidgets[WINDOW_FINANCES_PAGE_MARKETING]; window_init_scroll_widgets(w); } @@ -1060,13 +1081,13 @@ static void window_finances_marketing_invalidate(rct_window *w) sint32 y = Math::Max(1, numActiveCampaigns) * LIST_ROW_HEIGHT + 92; // Update group box positions - window_finances_marketing_widgets[WIDX_ACTIVE_CAMPAIGNS_GROUP].bottom = y - 22; - window_finances_marketing_widgets[WIDX_CAMPAIGNS_AVAILABLE_GROUP].top = y - 13; + _windowFinancesMarketingWidgets[WIDX_ACTIVE_CAMPAIGNS_GROUP].bottom = y - 22; + _windowFinancesMarketingWidgets[WIDX_CAMPAIGNS_AVAILABLE_GROUP].top = y - 13; // Update new campaign button visibility y += 3; for (i = 0; i < ADVERTISING_CAMPAIGN_COUNT; i++) { - rct_widget *campaignButton = &window_finances_marketing_widgets[WIDX_CAMPAIGN_1 + i]; + rct_widget *campaignButton = &_windowFinancesMarketingWidgets[WIDX_CAMPAIGN_1 + i]; campaignButton->type = WWT_EMPTY; @@ -1138,7 +1159,7 @@ static void window_finances_marketing_paint(rct_window *w, rct_drawpixelinfo *dp // Draw campaign button text for (i = 0; i < ADVERTISING_CAMPAIGN_COUNT; i++) { - rct_widget *campaginButton = &window_finances_marketing_widgets[WIDX_CAMPAIGN_1 + i]; + rct_widget *campaginButton = &_windowFinancesMarketingWidgets[WIDX_CAMPAIGN_1 + i]; if (campaginButton->type == WWT_EMPTY) continue; @@ -1243,7 +1264,7 @@ static void window_finances_research_dropdown(rct_window *w, rct_widgetindex wid static void window_finances_research_update(rct_window *w) { // Tab animation - if (++w->frame_no >= window_finances_tab_animation_loops[w->page]) + if (++w->frame_no >= WindowFinancesTabAnimationLoops[w->page]) w->frame_no = 0; widget_invalidate(w, WIDX_TAB_6); } @@ -1254,20 +1275,20 @@ static void window_finances_research_update(rct_window *w) */ static void window_finances_research_invalidate(rct_window *w) { - if (w->widgets != window_finances_page_widgets[WINDOW_FINANCES_PAGE_RESEARCH]) { - w->widgets = window_finances_page_widgets[WINDOW_FINANCES_PAGE_RESEARCH]; + if (w->widgets != _windowFinancesPageWidgets[WINDOW_FINANCES_PAGE_RESEARCH]) { + w->widgets = _windowFinancesPageWidgets[WINDOW_FINANCES_PAGE_RESEARCH]; window_init_scroll_widgets(w); } window_finances_set_pressed_tab(w); if (gResearchProgressStage == RESEARCH_STAGE_FINISHED_ALL) { - window_finances_research_widgets[WIDX_RESEARCH_FUNDING].type = WWT_EMPTY; - window_finances_research_widgets[WIDX_RESEARCH_FUNDING_DROPDOWN_BUTTON].type = WWT_EMPTY; + _windowFinancesResearchWidgets[WIDX_RESEARCH_FUNDING].type = WWT_EMPTY; + _windowFinancesResearchWidgets[WIDX_RESEARCH_FUNDING_DROPDOWN_BUTTON].type = WWT_EMPTY; } sint32 currentResearchLevel = gResearchFundingLevel; // Current funding - window_finances_research_widgets[WIDX_RESEARCH_FUNDING].text = ResearchFundingLevelNames[currentResearchLevel]; + _windowFinancesResearchWidgets[WIDX_RESEARCH_FUNDING].text = ResearchFundingLevelNames[currentResearchLevel]; // Checkboxes uint8 activeResearchTypes = gResearchPriorities; @@ -1321,10 +1342,10 @@ static void window_finances_set_page(rct_window *w, sint32 page) w->viewport = nullptr; } - w->enabled_widgets = window_finances_page_enabled_widgets[page]; - w->hold_down_widgets = window_finances_page_hold_down_widgets[page]; - w->event_handlers = window_finances_page_events[page]; - w->widgets = window_finances_page_widgets[page]; + w->enabled_widgets = WindowFinancesPageEnabledWidgets[page]; + w->hold_down_widgets = WindowFinancesPageHoldDownWidgets[page]; + w->event_handlers = _windowFinancesPageEvents[page]; + w->widgets = _windowFinancesPageWidgets[page]; w->disabled_widgets = 0; w->pressed_widgets = 0;