From 5beadb4f179c0f2caee36e1c209222bbbe456a98 Mon Sep 17 00:00:00 2001 From: duncanspumpkin Date: Mon, 3 Jul 2023 08:14:03 +0100 Subject: [PATCH 1/2] Remove unused array --- src/openrct2-ui/windows/Multiplayer.cpp | 2 -- src/openrct2/interface/Window_internal.h | 1 - 2 files changed, 3 deletions(-) diff --git a/src/openrct2-ui/windows/Multiplayer.cpp b/src/openrct2-ui/windows/Multiplayer.cpp index 8f33f1c355..f6c3277cf1 100644 --- a/src/openrct2-ui/windows/Multiplayer.cpp +++ b/src/openrct2-ui/windows/Multiplayer.cpp @@ -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(); diff --git a/src/openrct2/interface/Window_internal.h b/src/openrct2/interface/Window_internal.h index 4493ad1808..da32a6eb22 100644 --- a/src/openrct2/interface/Window_internal.h +++ b/src/openrct2/interface/Window_internal.h @@ -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; From 100793b5d667cb70b8bc50a57f937fa773a743eb Mon Sep 17 00:00:00 2001 From: duncanspumpkin Date: Mon, 3 Jul 2023 08:18:35 +0100 Subject: [PATCH 2/2] Remove unused variables from opens --- src/openrct2-ui/windows/InstallTrack.cpp | 1 - src/openrct2-ui/windows/NetworkStatus.cpp | 2 -- src/openrct2-ui/windows/Player.cpp | 4 ---- src/openrct2-ui/windows/ServerStart.cpp | 2 -- 4 files changed, 9 deletions(-) diff --git a/src/openrct2-ui/windows/InstallTrack.cpp b/src/openrct2-ui/windows/InstallTrack.cpp index 92886e10b9..d0911a144a 100644 --- a/src/openrct2-ui/windows/InstallTrack.cpp +++ b/src/openrct2-ui/windows/InstallTrack.cpp @@ -81,7 +81,6 @@ public: void OnOpen() override { widgets = window_install_track_widgets; - track_list.track_list_being_updated = false; WindowInitScrollWidgets(*this); WindowPushOthersRight(*this); diff --git a/src/openrct2-ui/windows/NetworkStatus.cpp b/src/openrct2-ui/windows/NetworkStatus.cpp index 8c7c4a55fb..5331d538ef 100644 --- a/src/openrct2-ui/windows/NetworkStatus.cpp +++ b/src/openrct2-ui/windows/NetworkStatus.cpp @@ -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; diff --git a/src/openrct2-ui/windows/Player.cpp b/src/openrct2-ui/windows/Player.cpp index 446b9503b2..524f42105d 100644 --- a/src/openrct2-ui/windows/Player.cpp +++ b/src/openrct2-ui/windows/Player.cpp @@ -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; diff --git a/src/openrct2-ui/windows/ServerStart.cpp b/src/openrct2-ui/windows/ServerStart.cpp index 05c31bb915..a682d0534b 100644 --- a/src/openrct2-ui/windows/ServerStart.cpp +++ b/src/openrct2-ui/windows/ServerStart.cpp @@ -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;