From c2dca8c08150f9fa0af825f9c1133990343d729a Mon Sep 17 00:00:00 2001 From: BrentVL-1952840 <70229620+Brentdevent@users.noreply.github.com> Date: Sat, 18 Feb 2023 10:22:19 +0100 Subject: [PATCH] Changes server console title - Separate function - Changing the window title when the server is not running --- src/client/component/dedicated_info.cpp | 43 ++++++++++++++++--------- 1 file changed, 27 insertions(+), 16 deletions(-) diff --git a/src/client/component/dedicated_info.cpp b/src/client/component/dedicated_info.cpp index 19c475f4..4e49e93e 100644 --- a/src/client/component/dedicated_info.cpp +++ b/src/client/component/dedicated_info.cpp @@ -11,6 +11,32 @@ namespace dedicated_info { + namespace + { + void set_server_info_in_console_title() + { + const auto sv_running = game::Dvar_FindVar("sv_running"); + const auto server_name = game::get_dvar_string("live_steam_server_name"); + + if (!sv_running || !sv_running->current.enabled) + { + std::string idle_text = server_name + " - not running"; + console::set_title(idle_text); + return; + } + + const auto mapname = game::get_dvar_string("mapname"); + + std::string window_text = utils::string::va("%s on %s [%d/%d] (%d)", + server_name.data(), + mapname.data(), + getinfo::get_client_count(), + getinfo::get_max_client_count(), + getinfo::get_bot_count()); + + console::set_title(window_text); + } + } class component final : public server_component { public: @@ -18,22 +44,7 @@ namespace dedicated_info { scheduler::loop([]() { - const auto sv_running = game::Dvar_FindVar("sv_running"); - - if (sv_running && sv_running->current.enabled) - { - const auto server_name = game::get_dvar_string("live_steam_server_name"); - const auto mapname = game::get_dvar_string("mapname"); - - std::string window_text = utils::string::va("%s on %s [%d/%d] (%d)", - server_name.data(), - mapname.data(), - getinfo::get_client_count(), - getinfo::get_max_client_count(), - getinfo::get_bot_count()); - - console::set_title(window_text); - } + set_server_info_in_console_title(); }, scheduler::pipeline::main, 1s); } };