mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-01-15 11:03:00 +01:00
Code Issues Releases Wiki Activity

Fix formatting and errors

Browse Source
This commit is contained in:
Gymnasiast
2020-05-05 22:50:31 +02:00
parent 43556d2dec
commit 00461aedf3
9 changed files with 21 additions and 78 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/openrct2-ui/windows/About.cpp
View File

@@ -49,7 +49,7 @@ enum WINDOW_ABOUT_WIDGET_IDX {
WINDOW_SKELETON(WINDOW_TITLE, WW, WH) }, \
{ WWT_IMGBTN, 1, 0, WW - 1, TABHEIGHT, WH - 1, 0xFFFFFFFF, STR_NONE }, /* page background */ \
{ WWT_TAB, 1, 3, 93, 17, TABHEIGHT, IMAGE_TYPE_REMAP | SPR_TAB_LARGE, STR_NONE }, /* about OpenRCT2 button */ \
{ WWT_TAB, 1, 94, 184, 17, TABHEIGHT, IMAGE_TYPE_REMAP | SPR_TAB_LARGE, STR_NONE /* about RCT2 button */
{ WWT_TAB, 1, 94, 184, 17, TABHEIGHT, IMAGE_TYPE_REMAP | SPR_TAB_LARGE, STR_NONE /* about RCT2 button */
static rct_widget window_about_openrct2_widgets[] = {
{ WIDGETS_MAIN },

3
src/openrct2-ui/windows/ClearScenery.cpp
View File

@@ -98,7 +98,8 @@ rct_window* window_clear_scenery_open()
if (window != nullptr)
return window;
window = window_create(ScreenCoordsXY(context_get_width() - 102, 29), 98, 94, &window_clear_scenery_events, WC_CLEAR_SCENERY, 0);
window = window_create(
ScreenCoordsXY(context_get_width() - 102, 29), 98, 94, &window_clear_scenery_events, WC_CLEAR_SCENERY, 0);
window->widgets = window_clear_scenery_widgets;
window->enabled_widgets = (1 << WIDX_CLOSE) | (1 << WIDX_INCREMENT) | (1 << WIDX_DECREMENT) | (1 << WIDX_PREVIEW)
| (1 << WIDX_SMALL_SCENERY) | (1 << WIDX_LARGE_SCENERY) | (1 << WIDX_FOOTPATH);

36
src/openrct2-ui/windows/Finances.cpp
View File

@@ -651,12 +651,6 @@ static void window_finances_summary_invalidate(rct_window* w)
window_finances_set_pressed_tab(w);
set_format_arg(6, money32, gBankLoan);
_windowFinancesPageWidgets[WINDOW_FINANCES_PAGE_SUMMARY][WIDX_TITLE].text = STR_FINANCIAL_SUMMARY;
_windowFinancesPageWidgets[WINDOW_FINANCES_PAGE_SUMMARY][WIDX_TITLE].right = 528;
_windowFinancesPageWidgets[WINDOW_FINANCES_PAGE_SUMMARY][WIDX_BACKGROUND].bottom = 310;
_windowFinancesPageWidgets[WINDOW_FINANCES_PAGE_SUMMARY][WIDX_BACKGROUND].right = 529;
_windowFinancesPageWidgets[WINDOW_FINANCES_PAGE_SUMMARY][WIDX_CLOSE].left = 517;
_windowFinancesPageWidgets[WINDOW_FINANCES_PAGE_SUMMARY][WIDX_CLOSE].right = 527;
}
/**
@@ -826,12 +820,6 @@ static void window_finances_financial_graph_invalidate(rct_window* w)
}
window_finances_set_pressed_tab(w);
_windowFinancesPageWidgets[WINDOW_FINANCES_PAGE_FINANCIAL_GRAPH][WIDX_TITLE].text = STR_FINANCIAL_GRAPH;
_windowFinancesPageWidgets[WINDOW_FINANCES_PAGE_FINANCIAL_GRAPH][WIDX_TITLE].right = 528;
_windowFinancesPageWidgets[WINDOW_FINANCES_PAGE_FINANCIAL_GRAPH][WIDX_BACKGROUND].bottom = 257;
_windowFinancesPageWidgets[WINDOW_FINANCES_PAGE_FINANCIAL_GRAPH][WIDX_BACKGROUND].right = 529;
_windowFinancesPageWidgets[WINDOW_FINANCES_PAGE_FINANCIAL_GRAPH][WIDX_CLOSE].left = 517;
_windowFinancesPageWidgets[WINDOW_FINANCES_PAGE_FINANCIAL_GRAPH][WIDX_CLOSE].right = 527;
}
/**
@@ -925,8 +913,6 @@ static void window_finances_park_value_graph_update(rct_window* w)
w->frame_no = 0;
w->Invalidate();
_windowFinancesPageWidgets[WIDX_BACKGROUND]->bottom = 257;
_windowFinancesPageWidgets[WIDX_BACKGROUND]->right = 529;
}
/**
@@ -942,10 +928,6 @@ static void window_finances_park_value_graph_invalidate(rct_window* w)
}
window_finances_set_pressed_tab(w);
_windowFinancesPageWidgets[WINDOW_FINANCES_PAGE_VALUE_GRAPH][WIDX_TITLE].text = STR_PARK_VALUE_GRAPH;
_windowFinancesPageWidgets[WINDOW_FINANCES_PAGE_VALUE_GRAPH][WIDX_TITLE].right = 528;
_windowFinancesPageWidgets[WINDOW_FINANCES_PAGE_VALUE_GRAPH][WIDX_CLOSE].left = 517;
_windowFinancesPageWidgets[WINDOW_FINANCES_PAGE_VALUE_GRAPH][WIDX_CLOSE].right = 527;
}
/**
@@ -1048,12 +1030,6 @@ static void window_finances_profit_graph_invalidate(rct_window* w)
}
window_finances_set_pressed_tab(w);
_windowFinancesPageWidgets[WINDOW_FINANCES_PAGE_PROFIT_GRAPH][WIDX_TITLE].text = STR_PROFIT_GRAPH;
_windowFinancesPageWidgets[WINDOW_FINANCES_PAGE_PROFIT_GRAPH][WIDX_TITLE].right = 528;
_windowFinancesPageWidgets[WINDOW_FINANCES_PAGE_PROFIT_GRAPH][WIDX_BACKGROUND].bottom = 257;
_windowFinancesPageWidgets[WINDOW_FINANCES_PAGE_PROFIT_GRAPH][WIDX_BACKGROUND].right = 529;
_windowFinancesPageWidgets[WINDOW_FINANCES_PAGE_PROFIT_GRAPH][WIDX_CLOSE].left = 517;
_windowFinancesPageWidgets[WINDOW_FINANCES_PAGE_PROFIT_GRAPH][WIDX_CLOSE].right = 527;
}
/**
@@ -1187,12 +1163,6 @@ static void window_finances_marketing_invalidate(rct_window* w)
campaignButton->type = WWT_EMPTY;
}
}
_windowFinancesPageWidgets[WINDOW_FINANCES_PAGE_MARKETING][WIDX_TITLE].text = STR_MARKETING;
_windowFinancesPageWidgets[WINDOW_FINANCES_PAGE_MARKETING][WIDX_TITLE].right = 528;
_windowFinancesPageWidgets[WINDOW_FINANCES_PAGE_MARKETING][WIDX_BACKGROUND].bottom = 257;
_windowFinancesPageWidgets[WINDOW_FINANCES_PAGE_MARKETING][WIDX_BACKGROUND].right = 529;
_windowFinancesPageWidgets[WINDOW_FINANCES_PAGE_MARKETING][WIDX_CLOSE].left = 517;
_windowFinancesPageWidgets[WINDOW_FINANCES_PAGE_MARKETING][WIDX_CLOSE].right = 527;
}
/**
@@ -1378,12 +1348,6 @@ static void window_finances_research_update(rct_window* w)
*/
static void window_finances_research_invalidate(rct_window* w)
{
_windowFinancesPageWidgets[WINDOW_FINANCES_PAGE_RESEARCH][WIDX_TITLE].text = STR_RESEARCH_FUNDING;
_windowFinancesPageWidgets[WINDOW_FINANCES_PAGE_RESEARCH][WIDX_TITLE].right = 318;
_windowFinancesPageWidgets[WINDOW_FINANCES_PAGE_RESEARCH][WIDX_BACKGROUND].bottom = 206;
_windowFinancesPageWidgets[WINDOW_FINANCES_PAGE_RESEARCH][WIDX_BACKGROUND].right = 319;
_windowFinancesPageWidgets[WINDOW_FINANCES_PAGE_RESEARCH][WIDX_CLOSE].left = 307;
_windowFinancesPageWidgets[WINDOW_FINANCES_PAGE_RESEARCH][WIDX_CLOSE].right = 317;
if (w->widgets != _windowFinancesPageWidgets[WINDOW_FINANCES_PAGE_RESEARCH])
{
w->widgets = _windowFinancesPageWidgets[WINDOW_FINANCES_PAGE_RESEARCH];

13
src/openrct2-ui/windows/Research.cpp
View File

@@ -320,12 +320,6 @@ static void window_research_development_invalidate(rct_window* w)
? SPR_NEW_RIDE
: SPR_NEW_SCENERY;
}
window_research_development_widgets[WIDX_TITLE].text = STR_RESEARCH_AND_DEVELOPMENT;
window_research_development_widgets[WIDX_TITLE].right = 298;
window_research_development_widgets[WIDX_BACKGROUND].right = 299;
window_research_development_widgets[WIDX_BACKGROUND].bottom = 195;
window_research_development_widgets[WIDX_CLOSE].left = 287;
window_research_development_widgets[WIDX_CLOSE].right = 297;
}
/**
@@ -556,13 +550,6 @@ static void window_research_funding_invalidate(rct_window* w)
w->pressed_widgets &= ~widgetMask;
}
}
window_research_funding_widgets[WIDX_TITLE].text = STR_RESEARCH_FUNDING;
window_research_funding_widgets[WIDX_TITLE].right = 318;
window_research_funding_widgets[WIDX_BACKGROUND].right = 319;
window_research_funding_widgets[WIDX_BACKGROUND].bottom = 206;
window_research_funding_widgets[WIDX_CLOSE].left = 307;
window_research_funding_widgets[WIDX_CLOSE].right = 317;
}
/**

1
src/openrct2-ui/windows/Ride.cpp
View File

@@ -53,7 +53,6 @@
#include <openrct2/sprites.h>
#include <openrct2/windows/Intent.h>
#include <openrct2/world/Park.h>
using namespace OpenRCT2;
static constexpr const rct_string_id WINDOW_TITLE = STR_RIDE_WINDOW_TITLE;

1
src/openrct2-ui/windows/SavePrompt.cpp
View File

@@ -171,7 +171,6 @@ rct_window* window_save_prompt_open()
log_warning("Invalid save prompt mode %u", prompt_mode);
return nullptr;
}
window = window_create_centred(
width, height, &window_save_prompt_events, WC_SAVE_PROMPT, WF_TRANSPARENT | WF_STICK_TO_FRONT);

37
src/openrct2-ui/windows/Scenery.cpp
View File

@@ -27,8 +27,6 @@
#include <openrct2/world/SmallScenery.h>
static constexpr const rct_string_id WINDOW_TITLE = STR_NONE;
static constexpr const int32_t WW = 634;
static constexpr const int32_t WH = 180;
constexpr int32_t WINDOW_SCENERY_WIDTH = 634;
constexpr int32_t WINDOW_SCENERY_HEIGHT = 180;
constexpr int32_t SCENERY_BUTTON_WIDTH = 66;
@@ -156,7 +154,7 @@ validate_global_widx(WC_SCENERY, WIDX_SCENERY_ROTATE_OBJECTS_BUTTON);
validate_global_widx(WC_SCENERY, WIDX_SCENERY_EYEDROPPER_BUTTON);
static rct_widget window_scenery_widgets[] = {
{ WINDOW_SKELETON(WINDOW_TITLE, WW, WH) },
{ WINDOW_SKELETON(WINDOW_TITLE, WINDOW_SCENERY_WIDTH, WINDOW_SCENERY_HEIGHT) },
{ WWT_RESIZE, 1, 0, 633, 43, 141, 0xFFFFFFFF, STR_NONE }, // 8 0x009DE2C8
{ WWT_TAB, 1, 3, 33, 17, 43, 0xFFFFFFFF, STR_STRING_DEFINED_TOOLTIP }, // 10 0x009DE2D8
{ WWT_TAB, 1, 34, 64, 17, 43, 0xFFFFFFFF, STR_STRING_DEFINED_TOOLTIP }, // 20 0x009DE2E8
@@ -452,7 +450,8 @@ rct_window* window_scenery_open()
window_scenery_init();
window = window_create(
ScreenCoordsXY(context_get_width() - WW, 0x1D), WW, WH, &window_scenery_events, WC_SCENERY, WF_NO_SCROLLING);
ScreenCoordsXY(context_get_width() - WINDOW_SCENERY_WIDTH, 0x1D), WINDOW_SCENERY_WIDTH, WINDOW_SCENERY_HEIGHT,
&window_scenery_events, WC_SCENERY, WF_NO_SCROLLING);
window->widgets = window_scenery_widgets;
window->enabled_widgets = (1 << WIDX_SCENERY_CLOSE) | (1 << WIDX_SCENERY_ROTATE_OBJECTS_BUTTON) | (1 << WIDX_SCENERY_TAB_1)
@@ -480,10 +479,10 @@ rct_window* window_scenery_open()
gWindowSceneryPaintEnabled = 0; // repaint coloured scenery tool state
gWindowSceneryEyedropperEnabled = false;
window->min_width = WW;
window->max_width = WW;
window->min_height = WH;
window->max_height = WH;
window->min_width = WINDOW_SCENERY_WIDTH;
window->max_width = WINDOW_SCENERY_WIDTH;
window->min_height = WINDOW_SCENERY_HEIGHT;
window->max_height = WINDOW_SCENERY_HEIGHT;
return window;
}
@@ -769,10 +768,10 @@ static void window_scenery_update(rct_window* w)
{
if (input_get_state() != INPUT_STATE_SCROLL_LEFT)
{
w->min_width = WW;
w->max_width = WW;
w->min_height = WH;
w->max_height = WH;
w->min_width = WINDOW_SCENERY_WIDTH;
w->max_width = WINDOW_SCENERY_WIDTH;
w->min_height = WINDOW_SCENERY_HEIGHT;
w->max_height = WINDOW_SCENERY_HEIGHT;
}
}
else
@@ -780,10 +779,10 @@ static void window_scenery_update(rct_window* w)
int32_t windowHeight = std::min(463, w->scrolls[0].v_bottom + 62);
if (context_get_height() < 600)
windowHeight = std::min(374, windowHeight);
windowHeight = std::max(WH, windowHeight);
windowHeight = std::max(WINDOW_SCENERY_HEIGHT, windowHeight);
w->min_width = WW;
w->max_width = WW;
w->min_width = WINDOW_SCENERY_WIDTH;
w->max_width = WINDOW_SCENERY_WIDTH;
w->min_height = windowHeight;
w->max_height = windowHeight;
}
@@ -795,10 +794,10 @@ static void window_scenery_update(rct_window* w)
w->scenery.hover_counter = 0;
if (input_get_state() != INPUT_STATE_SCROLL_LEFT)
{
w->min_width = WW;
w->max_width = WW;
w->min_height = WH;
w->max_height = WH;
w->min_width = WINDOW_SCENERY_WIDTH;
w->max_width = WINDOW_SCENERY_WIDTH;
w->min_height = WINDOW_SCENERY_HEIGHT;
w->max_height = WINDOW_SCENERY_HEIGHT;
}
}

4
src/openrct2-ui/windows/Staff.cpp
View File

@@ -89,8 +89,6 @@ static rct_widget window_staff_overview_widgets[] = {
//0x9AF910
static rct_widget window_staff_options_widgets[] = {
{ WWT_FRAME, 0, 0, WW - 1, 0, WH - 1, 0xFFFFFFFF, STR_NONE }, // Panel / Background
{ WWT_CAPTION, 0, 1, WW - 2, 1, 14, STR_STRINGID, STR_WINDOW_TITLE_TIP }, // Title
{ WINDOW_SKELETON(WINDOW_TITLE, WW, WH) },
{ WWT_RESIZE, 1, 0, WW - 1, 43, WH - 1, 0xFFFFFFFF, STR_NONE }, // Resize
{ WWT_TAB, 1, 3, 33, 17, 43, IMAGE_TYPE_REMAP | SPR_TAB, STR_STAFF_OVERVIEW_TIP },// Tab 1
@@ -108,8 +106,6 @@ static rct_widget window_staff_options_widgets[] = {
//0x9AF9F4
static rct_widget window_staff_stats_widgets[] = {
{ WWT_FRAME, 0, 0, WW - 1, 0, WH - 1, 0xFFFFFFFF, STR_NONE }, // Panel / Background
{ WWT_CAPTION, 0, 1, WW - 2, 1, 14, STR_STRINGID, STR_WINDOW_TITLE_TIP }, // Title
{ WINDOW_SKELETON(WINDOW_TITLE, WW, WH) },
{ WWT_RESIZE, 1, 0, WW - 1, 43, WH - 1, 0xFFFFFFFF, STR_NONE }, // Resize
{ WWT_TAB, 1, 3, 33, 17, 43, IMAGE_TYPE_REMAP | SPR_TAB, STR_STAFF_OVERVIEW_TIP },// Tab 1

2
src/openrct2-ui/windows/TrackDesignManage.cpp
View File

@@ -42,8 +42,6 @@ static rct_widget window_track_manage_widgets[] = {
};
static rct_widget window_track_delete_prompt_widgets[] = {
{ WWT_FRAME, 0, 0, 249, 0, 73, STR_NONE, STR_NONE },
{ WWT_CAPTION, 0, 1, 248, 1, 14, STR_DELETE_FILE, STR_WINDOW_TITLE_TIP },
{ WINDOW_SKELETON(WINDOW_TITLE, WW, WH) },
{ WWT_BUTTON, 0, 10, 119, 54, 65, STR_TRACK_MANAGE_DELETE, STR_NONE },
{ WWT_BUTTON, 0, 130, 239, 54, 65, STR_CANCEL, STR_NONE },