Merge pull request #187 from Brentdevent/server_console_name

Change server console window title to server name

src/client/component/console.cpp

@@ -1,8 +1,10 @@
 #include <std_include.hpp>
+#include "console.hpp"
 #include "loader/component_loader.hpp"
 #include "resource.hpp"
 
 #include "game/game.hpp"
+#include "scheduler.hpp"
 
 #include <utils/thread.hpp>
 #include <utils/hook.hpp>
@@ -14,6 +16,11 @@
 
 namespace console
 {
+	void set_title(const std::string& title)
+	{
+		SetWindowTextA(*game::s_wcd::hWnd, title.data());
+	}
+
 	namespace
 	{
 		utils::image::object logo;

src/client/component/console.hpp

@@ -0,0 +1,6 @@
+#pragma once
+
+namespace console
+{
+	void set_title(const std::string& title);
+}

src/client/component/dedicated_info.cpp

@@ -0,0 +1,53 @@
+#include <std_include.hpp>
+#include "loader/component_loader.hpp"
+
+#include "game/game.hpp"
+#include "game/utils.hpp"
+#include "scheduler.hpp"
+#include "getinfo.hpp"
+#include "console.hpp"
+
+#include <utils/string.hpp>
+
+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:
+		void post_unpack() override
+		{
+			scheduler::loop([]()
+			{
+				set_server_info_in_console_title();
+			}, scheduler::pipeline::main, 1s);
+		}
+	};
+}
+
+REGISTER_COMPONENT(dedicated_info::component)

src/client/component/getinfo.cpp

@@ -15,8 +15,6 @@
 #include "game/utils.hpp"
 
 namespace getinfo
-{
-	namespace
 {
 	int get_max_client_count()
 	{
@@ -41,6 +39,23 @@ namespace getinfo
 		return count;
 	}
 
+	int get_bot_count()
+	{
+		int count = 0;
+
+		for (int i = 0; i < get_max_client_count(); ++i)
+		{
+			if (game::SV_IsTestClient(i))
+			{
+				++count;
+			}
+		}
+
+		return count;
+	}
+
+	namespace
+	{
 		int Com_SessionMode_GetGameMode()
 		{
 			return *reinterpret_cast<int*>(game::select(0x1568EF7F4, 0x14948DB04)) << 14 >> 28;

src/client/component/getinfo.hpp

@@ -0,0 +1,8 @@
+#pragma once
+
+namespace getinfo
+{
+	int get_max_client_count();
+	int get_client_count();
+	int get_bot_count();
+}

src/client/game/symbols.hpp

@@ -22,11 +22,11 @@ namespace game
 	WEAK symbol<void(const char* file, int line, int code, const char* fmt, ...)> Com_Error_{0x1420F8BD0};
 	WEAK symbol<bool(eModes mode)> Com_SessionMode_IsMode{0x1420F7DD0};
 	WEAK symbol<bool()> Com_IsRunningUILevel{0x142148DB0};
-	WEAK symbol<void(uint32_t localClientNum, eModes fromMode, eModes toMode, uint32_t flags)> Com_SwitchMode{
+	WEAK symbol<void(int localClientNum, eModes fromMode, eModes toMode, uint32_t flags)> Com_SwitchMode{
 		0x14214AF30
 	};
 
-	WEAK symbol<void(uint32_t localClientNum, const char* text)> Cbuf_AddText{0x1420EC8B0, 0x1404F75B0};
+	WEAK symbol<void(int localClientNum, const char* text)> Cbuf_AddText{0x1420EC8B0, 0x1404F75B0};
 	WEAK symbol<void(int localClientNum, ControllerIndex_t controllerIndex, const char* buffer)> Cbuf_ExecuteBuffer{
 		0x14133BE10, 0x1404F78D0
 	};
@@ -38,8 +38,8 @@ namespace game
 	{
 		0x0, 0x1404F8280
 	};
-	WEAK symbol<void(uint32_t localClientNum, ControllerIndex_t controllerIndex, const char* text,
-	                 bool fromRemoteConsol)> Cmd_ExecuteSingleCommand{
+	WEAK symbol<void(int localClientNum, ControllerIndex_t controllerIndex, const char* text,
+	                 bool fromRemoteConsole)> Cmd_ExecuteSingleCommand{
 		0x1420EDC20
 	};
 	WEAK symbol<void(char* text, int maxSize)> Con_GetTextCopy{0x14133A7D0, 0x140182C40};
@@ -125,6 +125,7 @@ namespace game
 	// SV
 	WEAK symbol<void*()> SV_AddTestClient{0x1422499A0, 0x14052E3E0};
 	WEAK symbol<void(client_s* cl_0, svscmd_type type, const char* fmt, ...)> SV_SendServerCommand{0x0, 0x140537F10};
+	WEAK symbol<bool(int clientNum)> SV_IsTestClient{0x14224B5C0, 0x14052FF40};
 
 	// Variables