From 7b65522186e8f540efa991f1f3ad4bacbb00cfc2 Mon Sep 17 00:00:00 2001 From: momo5502 Date: Sun, 5 Mar 2023 10:47:12 +0100 Subject: [PATCH] Switch back to register component as all components have been adjusted --- src/client/component/arxan.cpp | 2 +- src/client/component/auth.cpp | 2 +- src/client/component/bots.cpp | 2 +- src/client/component/branding.cpp | 2 +- src/client/component/chat.cpp | 2 +- src/client/component/client_command.cpp | 2 +- src/client/component/client_patches.cpp | 2 +- src/client/component/colors.cpp | 2 +- src/client/component/command.cpp | 2 +- src/client/component/console.cpp | 2 +- src/client/component/console_command.cpp | 2 +- src/client/component/dedicated.cpp | 2 +- src/client/component/dedicated_info.cpp | 2 +- src/client/component/dedicated_patches.cpp | 2 +- src/client/component/demonware.cpp | 2 +- src/client/component/discord.cpp | 2 +- src/client/component/dvars.cpp | 2 +- src/client/component/exception.cpp | 2 +- src/client/component/extension.cpp | 2 +- src/client/component/game_log.cpp | 2 +- src/client/component/getinfo.cpp | 2 +- src/client/component/intro.cpp | 2 +- src/client/component/loot.cpp | 2 +- src/client/component/network.cpp | 2 +- src/client/component/party.cpp | 2 +- src/client/component/patches.cpp | 2 +- src/client/component/scheduler.cpp | 2 +- src/client/component/script.cpp | 2 +- src/client/component/server_list.cpp | 2 +- src/client/component/splash.cpp | 2 +- src/client/component/steam_proxy.cpp | 2 +- src/client/component/ui_scripting.cpp | 2 +- src/client/component/updater.cpp | 2 +- src/client/loader/component_loader.hpp | 4 +--- 34 files changed, 34 insertions(+), 36 deletions(-) diff --git a/src/client/component/arxan.cpp b/src/client/component/arxan.cpp index a135cd40..c99b3d45 100644 --- a/src/client/component/arxan.cpp +++ b/src/client/component/arxan.cpp @@ -800,4 +800,4 @@ namespace arxan }; } -REGISTER_COMPONENT_WORKING(arxan::component) +REGISTER_COMPONENT(arxan::component) diff --git a/src/client/component/auth.cpp b/src/client/component/auth.cpp index 55a7def0..a8ccb7ee 100644 --- a/src/client/component/auth.cpp +++ b/src/client/component/auth.cpp @@ -165,4 +165,4 @@ namespace auth }; } -REGISTER_COMPONENT_WORKING(auth::component) +REGISTER_COMPONENT(auth::component) diff --git a/src/client/component/bots.cpp b/src/client/component/bots.cpp index e07aa9b8..2f334f62 100644 --- a/src/client/component/bots.cpp +++ b/src/client/component/bots.cpp @@ -157,4 +157,4 @@ namespace bots }; } -REGISTER_COMPONENT_WORKING(bots::component) +REGISTER_COMPONENT(bots::component) diff --git a/src/client/component/branding.cpp b/src/client/component/branding.cpp index c5539723..dc8a48d6 100644 --- a/src/client/component/branding.cpp +++ b/src/client/component/branding.cpp @@ -34,4 +34,4 @@ namespace branding }; } -REGISTER_COMPONENT_WORKING(branding::component) +REGISTER_COMPONENT(branding::component) diff --git a/src/client/component/chat.cpp b/src/client/component/chat.cpp index ab24fc3b..ce3a92ad 100644 --- a/src/client/component/chat.cpp +++ b/src/client/component/chat.cpp @@ -56,4 +56,4 @@ namespace chat }; } -REGISTER_COMPONENT_WORKING(chat::component) +REGISTER_COMPONENT(chat::component) diff --git a/src/client/component/client_command.cpp b/src/client/component/client_command.cpp index f0b9b003..9456471b 100644 --- a/src/client/component/client_command.cpp +++ b/src/client/component/client_command.cpp @@ -54,4 +54,4 @@ namespace client_command }; } -REGISTER_COMPONENT_WORKING(client_command::component) +REGISTER_COMPONENT(client_command::component) diff --git a/src/client/component/client_patches.cpp b/src/client/component/client_patches.cpp index e2f71ebc..decf144d 100644 --- a/src/client/component/client_patches.cpp +++ b/src/client/component/client_patches.cpp @@ -86,4 +86,4 @@ namespace client_patches }; } -REGISTER_COMPONENT_WORKING(client_patches::component) +REGISTER_COMPONENT(client_patches::component) diff --git a/src/client/component/colors.cpp b/src/client/component/colors.cpp index d8319399..306c44b6 100644 --- a/src/client/component/colors.cpp +++ b/src/client/component/colors.cpp @@ -74,4 +74,4 @@ namespace colors }; } -REGISTER_COMPONENT_WORKING(colors::component) +REGISTER_COMPONENT(colors::component) diff --git a/src/client/component/command.cpp b/src/client/component/command.cpp index c5d8b35b..333d1087 100644 --- a/src/client/component/command.cpp +++ b/src/client/component/command.cpp @@ -194,4 +194,4 @@ namespace command } } -REGISTER_COMPONENT_WORKING(command::component) +REGISTER_COMPONENT(command::component) diff --git a/src/client/component/console.cpp b/src/client/component/console.cpp index 706ad825..c1975ae6 100644 --- a/src/client/component/console.cpp +++ b/src/client/component/console.cpp @@ -299,4 +299,4 @@ namespace console }; } -REGISTER_COMPONENT_WORKING(console::component) +REGISTER_COMPONENT(console::component) diff --git a/src/client/component/console_command.cpp b/src/client/component/console_command.cpp index f846d663..fbccc117 100644 --- a/src/client/component/console_command.cpp +++ b/src/client/component/console_command.cpp @@ -48,4 +48,4 @@ namespace console_command }; } -REGISTER_COMPONENT_WORKING(console_command::component) +REGISTER_COMPONENT(console_command::component) diff --git a/src/client/component/dedicated.cpp b/src/client/component/dedicated.cpp index 0d8d0d9c..6a5cde7f 100644 --- a/src/client/component/dedicated.cpp +++ b/src/client/component/dedicated.cpp @@ -73,4 +73,4 @@ namespace dedicated }; } -REGISTER_COMPONENT_WORKING(dedicated::component) +REGISTER_COMPONENT(dedicated::component) diff --git a/src/client/component/dedicated_info.cpp b/src/client/component/dedicated_info.cpp index f76238f3..1e36c58b 100644 --- a/src/client/component/dedicated_info.cpp +++ b/src/client/component/dedicated_info.cpp @@ -51,4 +51,4 @@ namespace dedicated_info }; } -REGISTER_COMPONENT_WORKING(dedicated_info::component) +REGISTER_COMPONENT(dedicated_info::component) diff --git a/src/client/component/dedicated_patches.cpp b/src/client/component/dedicated_patches.cpp index 22a244f1..0592acc1 100644 --- a/src/client/component/dedicated_patches.cpp +++ b/src/client/component/dedicated_patches.cpp @@ -92,4 +92,4 @@ namespace dedicated_patches }; } -REGISTER_COMPONENT_WORKING(dedicated_patches::component) +REGISTER_COMPONENT(dedicated_patches::component) diff --git a/src/client/component/demonware.cpp b/src/client/component/demonware.cpp index d31f85ec..dd868173 100644 --- a/src/client/component/demonware.cpp +++ b/src/client/component/demonware.cpp @@ -515,4 +515,4 @@ namespace demonware }; } -REGISTER_COMPONENT_WORKING(demonware::component) +REGISTER_COMPONENT(demonware::component) diff --git a/src/client/component/discord.cpp b/src/client/component/discord.cpp index 82719136..421fe889 100644 --- a/src/client/component/discord.cpp +++ b/src/client/component/discord.cpp @@ -67,5 +67,5 @@ namespace discord } #ifndef DEV_BUILD -REGISTER_COMPONENT_WORKING(discord::component) +REGISTER_COMPONENT(discord::component) #endif diff --git a/src/client/component/dvars.cpp b/src/client/component/dvars.cpp index c8173948..8bf1b58c 100644 --- a/src/client/component/dvars.cpp +++ b/src/client/component/dvars.cpp @@ -221,4 +221,4 @@ namespace dvars }; } -REGISTER_COMPONENT_WORKING(dvars::component) +REGISTER_COMPONENT(dvars::component) diff --git a/src/client/component/exception.cpp b/src/client/component/exception.cpp index e25f65c8..98c4e7f9 100644 --- a/src/client/component/exception.cpp +++ b/src/client/component/exception.cpp @@ -212,4 +212,4 @@ namespace exception }; } -REGISTER_COMPONENT_WORKING(exception::component) +REGISTER_COMPONENT(exception::component) diff --git a/src/client/component/extension.cpp b/src/client/component/extension.cpp index 46784bca..c959296e 100644 --- a/src/client/component/extension.cpp +++ b/src/client/component/extension.cpp @@ -37,4 +37,4 @@ namespace extension }; } -REGISTER_COMPONENT_WORKING(extension::component) +REGISTER_COMPONENT(extension::component) diff --git a/src/client/component/game_log.cpp b/src/client/component/game_log.cpp index b52abd76..d36d39c7 100644 --- a/src/client/component/game_log.cpp +++ b/src/client/component/game_log.cpp @@ -68,4 +68,4 @@ namespace game_log }; } -REGISTER_COMPONENT_WORKING(game_log::component) +REGISTER_COMPONENT(game_log::component) diff --git a/src/client/component/getinfo.cpp b/src/client/component/getinfo.cpp index 36c34aab..1deb6826 100644 --- a/src/client/component/getinfo.cpp +++ b/src/client/component/getinfo.cpp @@ -119,4 +119,4 @@ namespace getinfo }; } -REGISTER_COMPONENT_WORKING(getinfo::component) +REGISTER_COMPONENT(getinfo::component) diff --git a/src/client/component/intro.cpp b/src/client/component/intro.cpp index 164817e5..f207699d 100644 --- a/src/client/component/intro.cpp +++ b/src/client/component/intro.cpp @@ -33,5 +33,5 @@ namespace intro } #ifdef DEV_BUILD -REGISTER_COMPONENT_WORKING(intro::component) +REGISTER_COMPONENT(intro::component) #endif diff --git a/src/client/component/loot.cpp b/src/client/component/loot.cpp index b675cc62..b60de531 100644 --- a/src/client/component/loot.cpp +++ b/src/client/component/loot.cpp @@ -76,4 +76,4 @@ namespace loot }; }; -REGISTER_COMPONENT_WORKING(loot::component) +REGISTER_COMPONENT(loot::component) diff --git a/src/client/component/network.cpp b/src/client/component/network.cpp index 77847a20..8f035ceb 100644 --- a/src/client/component/network.cpp +++ b/src/client/component/network.cpp @@ -269,4 +269,4 @@ namespace network }; } -REGISTER_COMPONENT_WORKING(network::component) +REGISTER_COMPONENT(network::component) diff --git a/src/client/component/party.cpp b/src/client/component/party.cpp index 4065c3ef..365b134b 100644 --- a/src/client/component/party.cpp +++ b/src/client/component/party.cpp @@ -313,4 +313,4 @@ namespace party }; } -REGISTER_COMPONENT_WORKING(party::component) +REGISTER_COMPONENT(party::component) diff --git a/src/client/component/patches.cpp b/src/client/component/patches.cpp index 54ce700c..abe3c552 100644 --- a/src/client/component/patches.cpp +++ b/src/client/component/patches.cpp @@ -33,4 +33,4 @@ namespace patches }; } -REGISTER_COMPONENT_WORKING(patches::component) +REGISTER_COMPONENT(patches::component) diff --git a/src/client/component/scheduler.cpp b/src/client/component/scheduler.cpp index b22dc659..d4ac94b8 100644 --- a/src/client/component/scheduler.cpp +++ b/src/client/component/scheduler.cpp @@ -187,4 +187,4 @@ namespace scheduler }; } -REGISTER_COMPONENT_WORKING(scheduler::component) +REGISTER_COMPONENT(scheduler::component) diff --git a/src/client/component/script.cpp b/src/client/component/script.cpp index b32c4b19..7bdc3241 100644 --- a/src/client/component/script.cpp +++ b/src/client/component/script.cpp @@ -134,4 +134,4 @@ namespace script }; }; -REGISTER_COMPONENT_WORKING(script::component) +REGISTER_COMPONENT(script::component) diff --git a/src/client/component/server_list.cpp b/src/client/component/server_list.cpp index 7e008c0f..7bcff98e 100644 --- a/src/client/component/server_list.cpp +++ b/src/client/component/server_list.cpp @@ -145,4 +145,4 @@ namespace server_list }; } -REGISTER_COMPONENT_WORKING(server_list::component) +REGISTER_COMPONENT(server_list::component) diff --git a/src/client/component/splash.cpp b/src/client/component/splash.cpp index 426618ae..b86f2f6d 100644 --- a/src/client/component/splash.cpp +++ b/src/client/component/splash.cpp @@ -195,4 +195,4 @@ namespace splash } } -REGISTER_COMPONENT_WORKING(splash::component) +REGISTER_COMPONENT(splash::component) diff --git a/src/client/component/steam_proxy.cpp b/src/client/component/steam_proxy.cpp index 7457664a..568a9d97 100644 --- a/src/client/component/steam_proxy.cpp +++ b/src/client/component/steam_proxy.cpp @@ -317,4 +317,4 @@ namespace steam_proxy } } -REGISTER_COMPONENT_WORKING(steam_proxy::component) +REGISTER_COMPONENT(steam_proxy::component) diff --git a/src/client/component/ui_scripting.cpp b/src/client/component/ui_scripting.cpp index c10e4c0a..9152e16b 100644 --- a/src/client/component/ui_scripting.cpp +++ b/src/client/component/ui_scripting.cpp @@ -507,4 +507,4 @@ namespace ui_scripting }; } -REGISTER_COMPONENT_WORKING(ui_scripting::component) +REGISTER_COMPONENT(ui_scripting::component) diff --git a/src/client/component/updater.cpp b/src/client/component/updater.cpp index 8207e3a7..63a0230a 100644 --- a/src/client/component/updater.cpp +++ b/src/client/component/updater.cpp @@ -63,4 +63,4 @@ namespace updater }; } -REGISTER_COMPONENT_WORKING(updater::component) +REGISTER_COMPONENT(updater::component) diff --git a/src/client/loader/component_loader.hpp b/src/client/loader/component_loader.hpp index 7f2e9970..4d25d089 100644 --- a/src/client/loader/component_loader.hpp +++ b/src/client/loader/component_loader.hpp @@ -38,10 +38,8 @@ namespace component_loader }; }; -#define REGISTER_COMPONENT_WORKING(name) \ +#define REGISTER_COMPONENT(name) \ namespace \ { \ component_loader::installer __component; \ } - -#define REGISTER_COMPONENT(name)