Revert "fix(profile): move clanName handling into profile patches"

This reverts commit 383f078.

Author: ujicos

src/component/engine/console/command.cpp

@@ -20,7 +20,11 @@ namespace command
 		constexpr int CLIENT_REAL_PLAYER_OFFSET = 0x20;
 		constexpr int CLIENT_USERINFO_OFFSET = 1604;
 		constexpr int CLIENT_USERINFO_SIZE = 1024;
+		constexpr int ACTIVE_PROFILE_INDEX = 0;
 		constexpr auto BOT_NAMES_FILE = "consolation/bots.txt";
+		constexpr auto LIVE_CLAN_TARGET_PRIMARY = 0x111CF170;
+		constexpr auto LIVE_CLAN_TARGET_SECONDARY = 0x111F1C00;
+		constexpr auto CLAN_DIRTY_FLAGS = 0x1149E6BC;
 
 		std::unordered_map<std::string, std::function<void(params&)>> handlers;
 		int next_bot_number = 1;
@@ -210,6 +214,49 @@ namespace command
 			return std::format("consolation_bot{}", next_bot_number++ - 1);
 		}
 
+		std::string normalize_clan_name(const std::string& raw_value)
+		{
+			std::string result{};
+			result.reserve(4);
+
+			for (const auto ch : raw_value)
+			{
+				if (result.size() >= 4)
+				{
+					break;
+				}
+
+				auto normalized = static_cast<unsigned char>(ch);
+				if (normalized == '^')
+				{
+					normalized = ' ';
+				}
+
+				if (normalized < 32)
+				{
+					continue;
+				}
+
+				result.push_back(static_cast<char>(normalized));
+			}
+
+			return result;
+		}
+
+		const char* get_dvar_string(game::dvar_s* dvar)
+		{
+			return dvar && dvar->current.string ? dvar->current.string : "";
+		}
+
+		void update_clan_name_state(const std::string& clan_name)
+		{
+			game::Dvar_SetString("clanName", clan_name.c_str());
+			game::GamerProfile_UpdateProfileFromDvars(ACTIVE_PROFILE_INDEX, 1);
+			game::Live_UpdateClan(game::game_offset(LIVE_CLAN_TARGET_PRIMARY), const_cast<char*>(clan_name.c_str()));
+			game::Live_UpdateClan(game::game_offset(LIVE_CLAN_TARGET_SECONDARY), const_cast<char*>(clan_name.c_str()));
+			*reinterpret_cast<std::uint32_t*>(game::game_offset(CLAN_DIRTY_FLAGS)) |= 2u;
+		}
+
 		int rename_new_bot_client()
 		{
 			for (int i = 0; i < get_max_clients(); ++i)
@@ -386,6 +433,27 @@ namespace command
 								console::info("addbot: spawned %i bot(s)\n", spawned);
 						});
 
+					add("clanName", [](const params& args)
+						{
+							auto* const clan_name = game::Dvar_FindVar("clanName");
+							if (!clan_name)
+							{
+								console::error("clanName: dvar is unavailable\n");
+								return;
+							}
+
+							if (args.size() < 2)
+							{
+								console::info("clanName: current tag is \"%s\"\n", get_dvar_string(clan_name));
+								console::info("usage: clanName <tag>\n");
+								return;
+							}
+
+							const auto normalized = normalize_clan_name(args.join(1));
+							update_clan_name_state(normalized);
+							console::info("clanName: set tag to \"%s\"\n", normalized.c_str());
+						});
+
 					add("dvarDump", [](const params& argument)
 						{
 							std::string filename;

src/component/engine/patches/profile_patches.cpp

@@ -17,13 +17,8 @@ namespace profile_patches
 		const char default_profile_config_name[] = "config_mp.cfg";
 		const char custom_profile_config_name[] = "consolation_mp.cfg";
 		const char decrypted_profile_config_name[] = "consolation_mp_decrypted.cfg";
-		constexpr int active_profile_index = 0;
-		constexpr auto live_clan_target_primary = 0x111CF170;
-		constexpr auto live_clan_target_secondary = 0x111F1C00;
-		constexpr auto clan_dirty_flags = 0x1149E6BC;
 		void print_profile_message(const char* fmt, ...);
 		std::string build_profile_file_path(const char* filename);
-
 		const char* get_dvar_string(const std::size_t dvar_ptr_address)
 		{
 			const auto dvar = *reinterpret_cast<game::dvar_s**>(game::game_offset(dvar_ptr_address));
@@ -35,11 +30,6 @@ namespace profile_patches
 			return dvar->current.string;
 		}
 
-		const char* get_dvar_string(game::dvar_s* dvar)
-		{
-			return dvar && dvar->current.string ? dvar->current.string : "";
-		}
-
 		std::string join_path(const std::string& base, const std::string& leaf)
 		{
 			if (base.empty())
@@ -185,54 +175,6 @@ namespace profile_patches
 			return value.substr(first, last - first + 1);
 		}
 
-		std::string normalize_clan_name(const std::string& raw_value)
-		{
-			std::string result{};
-			result.reserve(4);
-
-			for (const auto ch : raw_value)
-			{
-				if (result.size() >= 4)
-				{
-					break;
-				}
-
-				const auto normalized = static_cast<unsigned char>(ch);
-				if (normalized < 32
-					|| normalized == '^'
-					|| normalized == 0xA4
-					|| normalized == '{'
-					|| normalized == '}'
-					|| normalized == '@')
-				{
-					continue;
-				}
-
-				result.push_back(static_cast<char>(normalized));
-			}
-
-			return trim_copy(result);
-		}
-
-		bool is_developer_reserved_clan_tag(const std::string& clan_name)
-		{
-			static const std::unordered_set<std::string> reserved_tags =
-			{
-				"csl",
-			};
-
-			return reserved_tags.find(to_lower(clan_name)) != reserved_tags.end();
-		}
-
-		void update_clan_name_state(const std::string& clan_name)
-		{
-			game::Dvar_SetString("clanName", clan_name.c_str());
-			game::GamerProfile_UpdateProfileFromDvars(active_profile_index, 1);
-			game::Live_UpdateClan(game::game_offset(live_clan_target_primary), clan_name.c_str());
-			game::Live_UpdateClan(game::game_offset(live_clan_target_secondary), clan_name.c_str());
-			*reinterpret_cast<std::uint32_t*>(game::game_offset(clan_dirty_flags)) |= 2u;
-		}
-
 		const char* find_canonical_dvar_name(const std::string& key)
 		{
 			static const std::unordered_map<std::string, const char*> canonical_names =
@@ -576,8 +518,9 @@ namespace profile_patches
 	public:
 		void post_load() override
 		{
-			// Keep the profile helper commands available, but avoid touching the
-			// stock signed-in config on the profile-login hot path.
+			// Keep the profile helper commands available, but do not alter the
+			// game's active config filename or save path automatically while we
+			// investigate signed-in startup freezes.
 
 			scheduler::once([]()
 			{
@@ -588,41 +531,6 @@ namespace profile_patches
 					migrate_config();
 				});
 
-				command::add("clanName", [](const command::params& args)
-				{
-					auto* const clan_name = game::Dvar_FindVar("clanName");
-					if (!clan_name)
-					{
-						print_profile_message("^1clanName: dvar is unavailable\n");
-						return;
-					}
-
-					if (args.size() < 2)
-					{
-						print_profile_message("^3clanName: current tag is \"%s\"\n", get_dvar_string(clan_name));
-						print_profile_message("^3usage: clanName <tag>\n");
-						return;
-					}
-
-					const auto normalized = normalize_clan_name(args.join(1));
-					if (normalized.empty())
-					{
-						print_profile_message("^1clanName: tag is empty or contains unsupported characters\n");
-						return;
-					}
-
-#ifndef DEBUG
-					if (is_developer_reserved_clan_tag(normalized))
-					{
-						print_profile_message("^1clanName: tag \"%s\" is reserved for developer builds\n", normalized.c_str());
-						return;
-					}
-#endif
-
-					update_clan_name_state(normalized);
-					print_profile_message("^3clanName: set tag to \"%s\"\n", normalized.c_str());
-				});
-
 				command::add("profile_convert_config", []()
 				{
 					convert_config();
@@ -657,6 +565,36 @@ namespace profile_patches
 				});
 			}, scheduler::main);
 
+			scheduler::loop([]()
+			{
+				static std::string imported_profile{};
+				static std::string missing_profile{};
+
+				const auto profile_name = get_profile_name();
+				if (profile_name.empty())
+				{
+					return;
+				}
+
+				if (profile_name == imported_profile || profile_name == missing_profile)
+				{
+					return;
+				}
+
+				const auto source_path = get_custom_profile_import_path();
+				if (source_path.empty())
+				{
+					missing_profile = profile_name;
+					return;
+				}
+
+				if (import_custom_profile_config_into_stock())
+				{
+					imported_profile = profile_name;
+					missing_profile.clear();
+				}
+			}, scheduler::main, 250ms);
+
 			scheduler::on_shutdown([]()
 			{
 				export_stock_profile_config_to_custom();