mirror of
https://github.com/OpenRCT2/OpenRCT2
synced 2026-01-15 19:13:07 +01:00
Merge pull request #20549 from duncanspumpkin/cleanup
Remove Misc. Window vars and users
This commit is contained in:
@@ -81,7 +81,6 @@ public:
|
||||
void OnOpen() override
|
||||
{
|
||||
widgets = window_install_track_widgets;
|
||||
track_list.track_list_being_updated = false;
|
||||
|
||||
WindowInitScrollWidgets(*this);
|
||||
WindowPushOthersRight(*this);
|
||||
|
||||
@@ -347,7 +347,6 @@ void MultiplayerWindow::OnResize()
|
||||
WindowSetResize(*this, 420, 124, 500, 450);
|
||||
|
||||
no_list_items = (IsServerPlayerInvisible() ? NetworkGetNumVisiblePlayers() : NetworkGetNumPlayers());
|
||||
list_item_positions[0] = 0;
|
||||
|
||||
widgets[WIDX_HEADER_PING].right = width - 5;
|
||||
|
||||
@@ -360,7 +359,6 @@ void MultiplayerWindow::OnResize()
|
||||
WindowSetResize(*this, 320, 200, 320, 500);
|
||||
|
||||
no_list_items = NetworkGetNumActions();
|
||||
list_item_positions[0] = 0;
|
||||
|
||||
selected_list_item = -1;
|
||||
Invalidate();
|
||||
|
||||
@@ -38,8 +38,6 @@ public:
|
||||
widgets = window_network_status_widgets;
|
||||
WindowInitScrollWidgets(*this);
|
||||
|
||||
no_list_items = 0;
|
||||
selected_list_item = -1;
|
||||
frame_no = 0;
|
||||
min_width = 320;
|
||||
min_height = 90;
|
||||
|
||||
@@ -100,8 +100,6 @@ public:
|
||||
min_height = 134;
|
||||
max_width = 500;
|
||||
max_height = 450;
|
||||
no_list_items = 0;
|
||||
selected_list_item = -1;
|
||||
|
||||
Invalidate();
|
||||
|
||||
@@ -216,8 +214,6 @@ private:
|
||||
|
||||
page = newPage;
|
||||
frame_no = 0;
|
||||
no_list_items = 0;
|
||||
selected_list_item = -1;
|
||||
|
||||
hold_down_widgets = 0;
|
||||
pressed_widgets = 0;
|
||||
|
||||
@@ -73,8 +73,6 @@ public:
|
||||
widgets[WIDX_GREETING_INPUT].string = _greeting;
|
||||
widgets[WIDX_PASSWORD_INPUT].string = _password;
|
||||
InitScrollWidgets();
|
||||
no_list_items = 0;
|
||||
selected_list_item = -1;
|
||||
frame_no = 0;
|
||||
min_width = width;
|
||||
min_height = height;
|
||||
|
||||
@@ -50,7 +50,6 @@ struct WindowBase
|
||||
};
|
||||
uint16_t flags{};
|
||||
ScrollBar scrolls[3];
|
||||
uint32_t list_item_positions[1024]{};
|
||||
uint16_t no_list_items{}; // 0 for no items
|
||||
int16_t selected_list_item{}; // -1 for none selected
|
||||
std::optional<Focus> focus;
|
||||
|
||||
Reference in New Issue
Block a user