From 4ece997ff31655e4d270c236b2732dd796381bb4 Mon Sep 17 00:00:00 2001 From: ZehMatt Date: Tue, 17 Aug 2021 06:33:50 +0300 Subject: [PATCH] Remove unused function network_close --- src/openrct2/network/NetworkBase.cpp | 8 -------- src/openrct2/network/network.h | 1 - src/openrct2/title/TitleScreen.cpp | 3 ++- 3 files changed, 2 insertions(+), 10 deletions(-) diff --git a/src/openrct2/network/NetworkBase.cpp b/src/openrct2/network/NetworkBase.cpp index 78ef434d6a..7b6af5e6af 100644 --- a/src/openrct2/network/NetworkBase.cpp +++ b/src/openrct2/network/NetworkBase.cpp @@ -3214,11 +3214,6 @@ void NetworkBase::Client_Handle_GAMEINFO([[maybe_unused]] NetworkConnection& con network_chat_show_server_greeting(); } -void network_close() -{ - OpenRCT2::GetContext()->GetNetwork().Close(); -} - void network_reconnect() { OpenRCT2::GetContext()->GetNetwork().Reconnect(); @@ -4214,9 +4209,6 @@ void network_send_chat(const char* text, const std::vector& playerIds) void network_send_password(const std::string& password) { } -void network_close() -{ -} void network_reconnect() { } diff --git a/src/openrct2/network/network.h b/src/openrct2/network/network.h index 8a166c5a24..ed06ba1b2f 100644 --- a/src/openrct2/network/network.h +++ b/src/openrct2/network/network.h @@ -35,7 +35,6 @@ enum class ModifyGroupType : uint8_t; enum class PermissionState : uint8_t; enum class NetworkPermission : uint32_t; -void network_close(); void network_reconnect(); void network_shutdown_client(); int32_t network_begin_client(const std::string& host, int32_t port); diff --git a/src/openrct2/title/TitleScreen.cpp b/src/openrct2/title/TitleScreen.cpp index f267ae4891..3fe9f9e2b1 100644 --- a/src/openrct2/title/TitleScreen.cpp +++ b/src/openrct2/title/TitleScreen.cpp @@ -23,6 +23,7 @@ #include "../interface/Viewport.h" #include "../interface/Window.h" #include "../localisation/Localisation.h" +#include "../network/NetworkBase.h" #include "../network/network.h" #include "../scenario/Scenario.h" #include "../scenario/ScenarioRepository.h" @@ -124,7 +125,7 @@ void TitleScreen::Load() gScreenAge = 0; gCurrentLoadedPath = ""; - network_close(); + GetContext()->GetNetwork().Close(); OpenRCT2::Audio::StopAll(); GetContext()->GetGameState()->InitAll(150); viewport_init_all();