From e22eccb3429f67c8ae102e6d8e23d1bba4bbf473 Mon Sep 17 00:00:00 2001
From: Maurice Heumann <mauriceheumann@gmail.com>
Date: Sat, 3 Dec 2022 19:56:24 +0100
Subject: [PATCH] More cleanup

---
 src/client/component/branding.cpp  | 60 +-----------------------------
 src/client/component/dedicated.cpp |  2 -
 src/client/game/symbols.hpp        |  2 +-
 src/client/main.cpp                |  1 -
 4 files changed, 3 insertions(+), 62 deletions(-)

diff --git a/src/client/component/branding.cpp b/src/client/component/branding.cpp
index c56659be..72b23f52 100644
--- a/src/client/component/branding.cpp
+++ b/src/client/component/branding.cpp
@@ -7,64 +7,10 @@
 
 #include <utils/hook.hpp>
 
-#include "utils/string.hpp"
-
 namespace branding
 {
 	namespace
 	{
-		std::map<int, std::string> connectivity_bits = {
-			{0x10000000, "???"},
-			{0x01000000, "LiveInventory_IsValid"},
-			{0x02000000, "LiveStorage_AreDDLsInSync"},
-			{0x04000000, "LiveInventory_InitialCODPointsChecked"},
-			{0x08000000, "Marketing_HaveMessages"},
-			{0x00100000, "LivePublisherVariables_AreVariablesAvailable"},
-			{0x00200000, "SaveGame_IsDataReady(controllerIndex, MODE_NETWORK_ONLINE)"},
-			{0x00400000, "LPC_IsLPCReady() || !Dvar_GetBool(live_useLPC)"},
-			{0x00800000, "LiveAntiCheat_ConsoleDetailsReported"},
-			{0x00010000, "Live_Qos_Finished"},
-			{0x00080000, "???"},
-			{0x00002000, "Live_IsGeoLocationDataRetrieved"},
-			{0x00000100, "LiveStorage_DoWeHavePlaylists"},
-			{0x00000200, "LiveStorage_ValidateFFOTD"},
-			{0x00000010, "LiveStats_Loadouts_Ready(controllerIndex, MODE_NETWORK_ONLINE)"},
-			{0x00000040, "g_dwNetStatus == 6"},
-			{0x00000080, "LiveStorage_DoWeHaveFFOTD"},
-			{0x00000002, "LiveUser_IsUserSignedInToLive"},
-			{0x00000004, "Live_IsUserSignedInToDemonware"},
-			{0x00000008, "LiveStats_Core_Ready(controllerIndex, MODE_NETWORK_ONLINE)"},
-		};
-
-		std::string get_connectivity_info()
-		{
-			int bits = 0;
-			game::Live_GetConnectivityInformation(0, &bits, false);
-			std::string str = utils::string::va("Bits: %X\n", bits);
-
-			int required_mask = 0x1FF923DE;
-			for (int i = 0; (1 << i) <= 0x10000000; ++i)
-			{
-				auto value = 1 << i;
-
-				const bool set = bits & value;
-				const bool req = required_mask & value;
-				if (!req) continue;
-
-				std::string name = "?";
-
-				auto entry = connectivity_bits.find(value);
-				if (entry != connectivity_bits.end())
-				{
-					name = entry->second;
-				}
-
-				str += utils::string::va("%08X - %d - %s\n", value, static_cast<int>(set), name.data());
-			}
-
-			return str;
-		}
-
 		void draw_branding()
 		{
 			constexpr auto x = 4;
@@ -72,12 +18,10 @@ namespace branding
 			constexpr auto scale = 0.45f;
 			float color[4] = {0.666f, 0.666f, 0.666f, 0.666f};
 
-			auto* font = reinterpret_cast<uint32_t*(*)()>(0x141CAC8E0_g)();
+			const auto* font = reinterpret_cast<uint32_t*(*)()>(0x141CAC8E0_g)();
 			if (!font) return;
 
-			std::string str = "BOIII: " VERSION;
-			//str += "\n\n" + get_connectivity_info();
-			game::R_AddCmdDrawText(str.data(), std::numeric_limits<int>::max(), font, static_cast<float>(x),
+			game::R_AddCmdDrawText("BOIII: " VERSION, std::numeric_limits<int>::max(), font, static_cast<float>(x),
 			                       y + static_cast<float>(font[2]) * scale,
 			                       scale, scale, 0.0f, color, game::ITEM_TEXTSTYLE_NORMAL);
 		}
diff --git a/src/client/component/dedicated.cpp b/src/client/component/dedicated.cpp
index e4d50306..7f2ebd58 100644
--- a/src/client/component/dedicated.cpp
+++ b/src/client/component/dedicated.cpp
@@ -7,7 +7,6 @@ namespace dedicated
 {
 	namespace
 	{
-		
 	}
 
 	class component final : public component_interface
@@ -15,7 +14,6 @@ namespace dedicated
 	public:
 		void post_unpack() override
 		{
-			
 		}
 	};
 }
diff --git a/src/client/game/symbols.hpp b/src/client/game/symbols.hpp
index acd5deb6..b8bff85b 100644
--- a/src/client/game/symbols.hpp
+++ b/src/client/game/symbols.hpp
@@ -56,7 +56,7 @@ namespace game
 	};
 
 	// Rendering
-	WEAK symbol<void(const char*, int, void*, float, float, float, float, float, float*, int)> R_AddCmdDrawText{
+	WEAK symbol<void(const char*, int, const void*, float, float, float, float, float, const float*, int)> R_AddCmdDrawText{
 		0x141CD98D0
 	};
 
diff --git a/src/client/main.cpp b/src/client/main.cpp
index 7714b974..4bf5deb9 100644
--- a/src/client/main.cpp
+++ b/src/client/main.cpp
@@ -215,7 +215,6 @@ namespace
 	}
 }
 
-
 int __stdcall WinMain(HINSTANCE, HINSTANCE, PSTR, int)
 {
 	return main();