diff --git a/Source/DiabloUI/selgame.cpp b/Source/DiabloUI/selgame.cpp index 18403691511..86c931d27ff 100644 --- a/Source/DiabloUI/selgame.cpp +++ b/Source/DiabloUI/selgame.cpp @@ -52,7 +52,6 @@ static Uint32 ztNextRefresh; #else static constexpr bool ztProvider = false; static constexpr UiTxtButton* ztBlOckBtn = NULL; -static constexpr Uint32 ztNextRefresh = 0; #endif static unsigned selgame_connum; static unsigned selgame_conidx; diff --git a/Source/dvlnet/tcp_server.h b/Source/dvlnet/tcp_server.h index 593a6c56206..c21002290b4 100644 --- a/Source/dvlnet/tcp_server.h +++ b/Source/dvlnet/tcp_server.h @@ -45,12 +45,17 @@ class tcp_server { tcp_server(base_client& client, asio::io_context& ioc, packet_factory& pktfty, SNetGameData& gameinfo, unsigned serverType); bool setup_server(const char* bindAddr, unsigned short port, char (&errorText)[256]); void close(); - ~tcp_server() = default; + virtual ~tcp_server() = default; static void make_default_gamename(char (&gamename)[NET_MAX_GAMENAME_LEN + 1]); static void connect_acceptor(asio::ip::tcp::acceptor& acceptor, const asio::ip::tcp::endpoint& ep, asio::error_code& ec); static void connect_socket(asio::ip::tcp::socket& sock, const char* addrstr, unsigned port, asio::io_context& ioc, asio::error_code& ec); +protected: + base_client& local_client; // TODO: tcp_client would be better, but tcp_host_client is not one... + + virtual bool send_packet(packet& pkt); + private: asio::io_context& ioc; asio::ip::tcp::acceptor acceptor; @@ -78,11 +83,6 @@ class tcp_server { void start_timeout(); void handle_timeout(const asio::error_code& ec); void drop_connection(const scc& con); - -protected: - base_client& local_client; // TODO: tcp_client would be better, but tcp_host_client is not one... - - virtual bool send_packet(packet& pkt); }; } //namespace net