From 77fd6b6e80bf6965152a05075bf3f54dfa6f861a Mon Sep 17 00:00:00 2001 From: F1F7Y Date: Wed, 16 Aug 2023 12:48:39 +0200 Subject: [PATCH] Move `core/convar/` to `tier1/` --- primedev/Northstar.cmake | 12 ++++++------ primedev/client/audio.cpp | 2 +- primedev/client/chatcommand.cpp | 4 ++-- primedev/client/clientauthhooks.cpp | 2 +- primedev/client/clientruihooks.cpp | 2 +- primedev/client/debugoverlay.cpp | 2 +- primedev/client/demofixes.cpp | 2 +- primedev/client/latencyflex.cpp | 2 +- primedev/dedicated/dedicatedlogtoclient.cpp | 2 ++ primedev/dedicated/dedicatedlogtoclient.h | 2 +- primedev/engine/host.cpp | 2 +- primedev/engine/r2engine.h | 2 ++ primedev/logging/logging.cpp | 4 ++-- primedev/logging/loghooks.cpp | 4 ++-- primedev/logging/sourceconsole.cpp | 4 ++-- primedev/masterserver/masterserver.cpp | 2 +- primedev/masterserver/masterserver.h | 2 +- primedev/mods/modmanager.cpp | 4 ++-- primedev/mods/modmanager.h | 2 +- primedev/plugins/pluginbackend.cpp | 2 +- primedev/plugins/plugins.cpp | 2 +- .../client/scriptservertoclientstringcommand.cpp | 4 ++-- primedev/scripts/scriptdatatables.cpp | 2 +- primedev/server/alltalk.cpp | 2 +- primedev/server/auth/bansystem.cpp | 2 +- primedev/server/auth/serverauthentication.cpp | 6 +++--- primedev/server/auth/serverauthentication.h | 2 +- primedev/server/buildainfile.cpp | 2 +- primedev/server/servernethooks.cpp | 2 +- primedev/server/serverpresence.cpp | 2 +- primedev/server/serverpresence.h | 2 +- primedev/shared/exploit_fixes/exploitfixes.cpp | 2 +- primedev/shared/exploit_fixes/ns_limits.h | 2 +- primedev/shared/misccommands.cpp | 2 +- primedev/shared/playlist.cpp | 4 ++-- primedev/squirrel/squirrel.cpp | 2 +- .../{core/convar/concommand.cpp => tier1/cmd.cpp} | 2 +- primedev/{core/convar/concommand.h => tier1/cmd.h} | 0 primedev/{core/convar => tier1}/convar.cpp | 0 primedev/{core/convar => tier1}/convar.h | 2 +- primedev/{core/convar => tier1}/cvar.cpp | 2 +- primedev/{core/convar => tier1}/cvar.h | 0 primedev/util/printcommands.cpp | 6 +++--- primedev/util/printcommands.h | 2 +- primedev/util/printmaps.cpp | 4 ++-- 45 files changed, 61 insertions(+), 57 deletions(-) rename primedev/{core/convar/concommand.cpp => tier1/cmd.cpp} (99%) rename primedev/{core/convar/concommand.h => tier1/cmd.h} (100%) rename primedev/{core/convar => tier1}/convar.cpp (100%) rename primedev/{core/convar => tier1}/convar.h (99%) rename primedev/{core/convar => tier1}/cvar.cpp (97%) rename primedev/{core/convar => tier1}/cvar.h (100%) diff --git a/primedev/Northstar.cmake b/primedev/Northstar.cmake index 433326c2b..e8721ccd3 100644 --- a/primedev/Northstar.cmake +++ b/primedev/Northstar.cmake @@ -26,12 +26,6 @@ add_library( "client/rejectconnectionfixes.cpp" "config/profile.cpp" "config/profile.h" - "core/convar/concommand.cpp" - "core/convar/concommand.h" - "core/convar/convar.cpp" - "core/convar/convar.h" - "core/convar/cvar.cpp" - "core/convar/cvar.h" "core/filesystem/filesystem.cpp" "core/filesystem/filesystem.h" "core/filesystem/rpakfilesystem.cpp" @@ -139,6 +133,12 @@ add_library( "squirrel/squirrelautobind.h" "squirrel/squirrelclasstypes.h" "squirrel/squirreldatatypes.h" + "tier1/cmd.cpp" + "tier1/cmd.h" + "tier1/convar.cpp" + "tier1/convar.h" + "tier1/cvar.cpp" + "tier1/cvar.h" "util/printcommands.cpp" "util/printcommands.h" "util/printmaps.cpp" diff --git a/primedev/client/audio.cpp b/primedev/client/audio.cpp index aa32e390d..d5390d859 100644 --- a/primedev/client/audio.cpp +++ b/primedev/client/audio.cpp @@ -1,6 +1,6 @@ #include "audio.h" #include "dedicated/dedicated.h" -#include "core/convar/convar.h" +#include "tier1/convar.h" #include "rapidjson/error/en.h" #include diff --git a/primedev/client/chatcommand.cpp b/primedev/client/chatcommand.cpp index 9cf34e432..578b83f64 100644 --- a/primedev/client/chatcommand.cpp +++ b/primedev/client/chatcommand.cpp @@ -1,5 +1,5 @@ -#include "core/convar/convar.h" -#include "core/convar/concommand.h" +#include "tier1/convar.h" +#include "tier1/cmd.h" #include "localchatwriter.h" // note: isIngameChat is an int64 because the whole register the arg is stored in needs to be 0'd out to work diff --git a/primedev/client/clientauthhooks.cpp b/primedev/client/clientauthhooks.cpp index 35ae3aa77..91fd1e419 100644 --- a/primedev/client/clientauthhooks.cpp +++ b/primedev/client/clientauthhooks.cpp @@ -1,5 +1,5 @@ #include "masterserver/masterserver.h" -#include "core/convar/convar.h" +#include "tier1/convar.h" #include "client/r2client.h" #include "core/vanilla.h" diff --git a/primedev/client/clientruihooks.cpp b/primedev/client/clientruihooks.cpp index ad50d11a8..8c85da035 100644 --- a/primedev/client/clientruihooks.cpp +++ b/primedev/client/clientruihooks.cpp @@ -1,4 +1,4 @@ -#include "core/convar/convar.h" +#include "tier1/convar.h" AUTOHOOK_INIT() diff --git a/primedev/client/debugoverlay.cpp b/primedev/client/debugoverlay.cpp index e231054d4..54660b279 100644 --- a/primedev/client/debugoverlay.cpp +++ b/primedev/client/debugoverlay.cpp @@ -1,5 +1,5 @@ #include "dedicated/dedicated.h" -#include "core/convar/cvar.h" +#include "tier1/cvar.h" #include "core/math/vector.h" AUTOHOOK_INIT() diff --git a/primedev/client/demofixes.cpp b/primedev/client/demofixes.cpp index 344764baa..d9bbb1bff 100644 --- a/primedev/client/demofixes.cpp +++ b/primedev/client/demofixes.cpp @@ -1,4 +1,4 @@ -#include "core/convar/convar.h" +#include "tier1/convar.h" ON_DLL_LOAD_CLIENT("engine.dll", EngineDemoFixes, (CModule module)) { diff --git a/primedev/client/latencyflex.cpp b/primedev/client/latencyflex.cpp index 25e38c7a4..86e16db27 100644 --- a/primedev/client/latencyflex.cpp +++ b/primedev/client/latencyflex.cpp @@ -1,4 +1,4 @@ -#include "core/convar/convar.h" +#include "tier1/convar.h" AUTOHOOK_INIT() diff --git a/primedev/dedicated/dedicatedlogtoclient.cpp b/primedev/dedicated/dedicatedlogtoclient.cpp index bf2cf77a0..be92e1721 100644 --- a/primedev/dedicated/dedicatedlogtoclient.cpp +++ b/primedev/dedicated/dedicatedlogtoclient.cpp @@ -1,4 +1,6 @@ #include "dedicatedlogtoclient.h" + +#include "tier1/convar.h" #include "engine/r2engine.h" void (*CGameClient__ClientPrintf)(CBaseClient* pClient, const char* fmt, ...); diff --git a/primedev/dedicated/dedicatedlogtoclient.h b/primedev/dedicated/dedicatedlogtoclient.h index 82f4c56b4..6e99e4ab5 100644 --- a/primedev/dedicated/dedicatedlogtoclient.h +++ b/primedev/dedicated/dedicatedlogtoclient.h @@ -1,6 +1,6 @@ #pragma once #include "logging/logging.h" -#include "core/convar/convar.h" +#include "tier1/convar.h" class DedicatedServerLogToClientSink : public CustomSink { diff --git a/primedev/engine/host.cpp b/primedev/engine/host.cpp index dacb8fc1c..f6117a69d 100644 --- a/primedev/engine/host.cpp +++ b/primedev/engine/host.cpp @@ -1,4 +1,4 @@ -#include "core/convar/convar.h" +#include "tier1/convar.h" #include "mods/modmanager.h" #include "util/printcommands.h" #include "util/printmaps.h" diff --git a/primedev/engine/r2engine.h b/primedev/engine/r2engine.h index e3bcc37e3..a402545b4 100644 --- a/primedev/engine/r2engine.h +++ b/primedev/engine/r2engine.h @@ -1,4 +1,6 @@ #pragma once + +#include "tier1/cmd.h" #include "shared/keyvalues.h" // Cbuf diff --git a/primedev/logging/logging.cpp b/primedev/logging/logging.cpp index 3416bb8cb..932220074 100644 --- a/primedev/logging/logging.cpp +++ b/primedev/logging/logging.cpp @@ -1,6 +1,6 @@ #include "logging.h" -#include "core/convar/convar.h" -#include "core/convar/concommand.h" +#include "tier1/convar.h" +#include "tier1/cmd.h" #include "config/profile.h" #include "core/tier0.h" #include "util/version.h" diff --git a/primedev/logging/loghooks.cpp b/primedev/logging/loghooks.cpp index 7efb5b995..0de47bfe2 100644 --- a/primedev/logging/loghooks.cpp +++ b/primedev/logging/loghooks.cpp @@ -1,7 +1,7 @@ #include "logging.h" #include "loghooks.h" -#include "core/convar/convar.h" -#include "core/convar/concommand.h" +#include "tier1/convar.h" +#include "tier1/cmd.h" #include "core/math/bitbuf.h" #include "config/profile.h" #include "core/tier0.h" diff --git a/primedev/logging/sourceconsole.cpp b/primedev/logging/sourceconsole.cpp index e436d1d42..33a795a3f 100644 --- a/primedev/logging/sourceconsole.cpp +++ b/primedev/logging/sourceconsole.cpp @@ -1,7 +1,7 @@ -#include "core/convar/convar.h" +#include "tier1/convar.h" #include "sourceconsole.h" #include "core/sourceinterface.h" -#include "core/convar/concommand.h" +#include "tier1/cmd.h" #include "util/printcommands.h" SourceInterface* g_pSourceGameConsole; diff --git a/primedev/masterserver/masterserver.cpp b/primedev/masterserver/masterserver.cpp index aa2484644..db5571d4b 100644 --- a/primedev/masterserver/masterserver.cpp +++ b/primedev/masterserver/masterserver.cpp @@ -1,5 +1,5 @@ #include "masterserver/masterserver.h" -#include "core/convar/concommand.h" +#include "tier1/cmd.h" #include "shared/playlist.h" #include "server/auth/serverauthentication.h" #include "core/tier0.h" diff --git a/primedev/masterserver/masterserver.h b/primedev/masterserver/masterserver.h index 570db619f..b39212372 100644 --- a/primedev/masterserver/masterserver.h +++ b/primedev/masterserver/masterserver.h @@ -1,6 +1,6 @@ #pragma once -#include "core/convar/convar.h" +#include "tier1/convar.h" #include "server/serverpresence.h" #include #include diff --git a/primedev/mods/modmanager.cpp b/primedev/mods/modmanager.cpp index 8a0eb71d1..b98d8e840 100644 --- a/primedev/mods/modmanager.cpp +++ b/primedev/mods/modmanager.cpp @@ -1,6 +1,6 @@ #include "modmanager.h" -#include "core/convar/convar.h" -#include "core/convar/concommand.h" +#include "tier1/convar.h" +#include "tier1/cmd.h" #include "client/audio.h" #include "masterserver/masterserver.h" #include "core/filesystem/filesystem.h" diff --git a/primedev/mods/modmanager.h b/primedev/mods/modmanager.h index 233f004d4..63f2edf2b 100644 --- a/primedev/mods/modmanager.h +++ b/primedev/mods/modmanager.h @@ -1,5 +1,5 @@ #pragma once -#include "core/convar/convar.h" +#include "tier1/convar.h" #include "core/memalloc.h" #include "squirrel/squirrel.h" diff --git a/primedev/plugins/pluginbackend.cpp b/primedev/plugins/pluginbackend.cpp index 850394acf..e69ec6c2e 100644 --- a/primedev/plugins/pluginbackend.cpp +++ b/primedev/plugins/pluginbackend.cpp @@ -5,7 +5,7 @@ #include "squirrel/squirrel.h" #include "plugins.h" -#include "core/convar/concommand.h" +#include "tier1/cmd.h" #include diff --git a/primedev/plugins/plugins.cpp b/primedev/plugins/plugins.cpp index 72b645667..2899db65f 100644 --- a/primedev/plugins/plugins.cpp +++ b/primedev/plugins/plugins.cpp @@ -4,7 +4,7 @@ #include "squirrel/squirrel.h" #include "plugins.h" #include "masterserver/masterserver.h" -#include "core/convar/convar.h" +#include "tier1/convar.h" #include "server/serverpresence.h" #include #include diff --git a/primedev/scripts/client/scriptservertoclientstringcommand.cpp b/primedev/scripts/client/scriptservertoclientstringcommand.cpp index a3a81c8ae..e884e21d1 100644 --- a/primedev/scripts/client/scriptservertoclientstringcommand.cpp +++ b/primedev/scripts/client/scriptservertoclientstringcommand.cpp @@ -1,6 +1,6 @@ #include "squirrel/squirrel.h" -#include "core/convar/convar.h" -#include "core/convar/concommand.h" +#include "tier1/convar.h" +#include "tier1/cmd.h" void ConCommand_ns_script_servertoclientstringcommand(const CCommand& arg) { diff --git a/primedev/scripts/scriptdatatables.cpp b/primedev/scripts/scriptdatatables.cpp index 87a26dca0..cd50ebf65 100644 --- a/primedev/scripts/scriptdatatables.cpp +++ b/primedev/scripts/scriptdatatables.cpp @@ -1,6 +1,6 @@ #include "squirrel/squirrel.h" #include "core/filesystem/rpakfilesystem.h" -#include "core/convar/convar.h" +#include "tier1/convar.h" #include "dedicated/dedicated.h" #include "core/filesystem/filesystem.h" #include "core/math/vector.h" diff --git a/primedev/server/alltalk.cpp b/primedev/server/alltalk.cpp index 74119309f..16bc86544 100644 --- a/primedev/server/alltalk.cpp +++ b/primedev/server/alltalk.cpp @@ -1,4 +1,4 @@ -#include "core/convar/convar.h" +#include "tier1/convar.h" #include "engine/r2engine.h" size_t __fastcall ShouldAllowAlltalk() diff --git a/primedev/server/auth/bansystem.cpp b/primedev/server/auth/bansystem.cpp index 6e4d16447..2eeb75042 100644 --- a/primedev/server/auth/bansystem.cpp +++ b/primedev/server/auth/bansystem.cpp @@ -1,6 +1,6 @@ #include "bansystem.h" #include "serverauthentication.h" -#include "core/convar/concommand.h" +#include "tier1/cmd.h" #include "server/r2server.h" #include "engine/r2engine.h" #include "client/r2client.h" diff --git a/primedev/server/auth/serverauthentication.cpp b/primedev/server/auth/serverauthentication.cpp index 0d46426fe..9a480df0c 100644 --- a/primedev/server/auth/serverauthentication.cpp +++ b/primedev/server/auth/serverauthentication.cpp @@ -1,12 +1,12 @@ #include "serverauthentication.h" #include "shared/exploit_fixes/ns_limits.h" -#include "core/convar/cvar.h" -#include "core/convar/convar.h" +#include "tier1/cvar.h" +#include "tier1/convar.h" #include "masterserver/masterserver.h" #include "server/serverpresence.h" #include "engine/hoststate.h" #include "bansystem.h" -#include "core/convar/concommand.h" +#include "tier1/cmd.h" #include "dedicated/dedicated.h" #include "config/profile.h" #include "core/tier0.h" diff --git a/primedev/server/auth/serverauthentication.h b/primedev/server/auth/serverauthentication.h index 996d20e1c..6ac635ca2 100644 --- a/primedev/server/auth/serverauthentication.h +++ b/primedev/server/auth/serverauthentication.h @@ -1,5 +1,5 @@ #pragma once -#include "core/convar/convar.h" +#include "tier1/convar.h" #include "engine/r2engine.h" #include #include diff --git a/primedev/server/buildainfile.cpp b/primedev/server/buildainfile.cpp index a7f599618..083cf84e3 100644 --- a/primedev/server/buildainfile.cpp +++ b/primedev/server/buildainfile.cpp @@ -1,4 +1,4 @@ -#include "core/convar/convar.h" +#include "tier1/convar.h" #include "engine/hoststate.h" #include "engine/r2engine.h" diff --git a/primedev/server/servernethooks.cpp b/primedev/server/servernethooks.cpp index 148b735fa..7dfbf1c90 100644 --- a/primedev/server/servernethooks.cpp +++ b/primedev/server/servernethooks.cpp @@ -1,4 +1,4 @@ -#include "core/convar/convar.h" +#include "tier1/convar.h" #include "engine/r2engine.h" #include "shared/exploit_fixes/ns_limits.h" #include "masterserver/masterserver.h" diff --git a/primedev/server/serverpresence.cpp b/primedev/server/serverpresence.cpp index 159b9f30a..010e22ce2 100644 --- a/primedev/server/serverpresence.cpp +++ b/primedev/server/serverpresence.cpp @@ -1,7 +1,7 @@ #include "serverpresence.h" #include "shared/playlist.h" #include "core/tier0.h" -#include "core/convar/convar.h" +#include "tier1/convar.h" #include diff --git a/primedev/server/serverpresence.h b/primedev/server/serverpresence.h index c644cc377..b7df7dc0b 100644 --- a/primedev/server/serverpresence.h +++ b/primedev/server/serverpresence.h @@ -1,5 +1,5 @@ #pragma once -#include "core/convar/convar.h" +#include "tier1/convar.h" struct ServerPresence { diff --git a/primedev/shared/exploit_fixes/exploitfixes.cpp b/primedev/shared/exploit_fixes/exploitfixes.cpp index 8064d5aca..6ca2bd791 100644 --- a/primedev/shared/exploit_fixes/exploitfixes.cpp +++ b/primedev/shared/exploit_fixes/exploitfixes.cpp @@ -1,4 +1,4 @@ -#include "core/convar/cvar.h" +#include "tier1/cvar.h" #include "ns_limits.h" #include "dedicated/dedicated.h" #include "core/tier0.h" diff --git a/primedev/shared/exploit_fixes/ns_limits.h b/primedev/shared/exploit_fixes/ns_limits.h index 546fec6f1..275e57c69 100644 --- a/primedev/shared/exploit_fixes/ns_limits.h +++ b/primedev/shared/exploit_fixes/ns_limits.h @@ -1,6 +1,6 @@ #pragma once #include "engine/r2engine.h" -#include "core/convar/convar.h" +#include "tier1/convar.h" #include struct PlayerLimitData diff --git a/primedev/shared/misccommands.cpp b/primedev/shared/misccommands.cpp index 15da67679..c0aac437d 100644 --- a/primedev/shared/misccommands.cpp +++ b/primedev/shared/misccommands.cpp @@ -1,5 +1,5 @@ #include "misccommands.h" -#include "core/convar/concommand.h" +#include "tier1/cmd.h" #include "shared/playlist.h" #include "engine/r2engine.h" #include "client/r2client.h" diff --git a/primedev/shared/playlist.cpp b/primedev/shared/playlist.cpp index 2b9ad9798..72697bf12 100644 --- a/primedev/shared/playlist.cpp +++ b/primedev/shared/playlist.cpp @@ -1,6 +1,6 @@ #include "playlist.h" -#include "core/convar/concommand.h" -#include "core/convar/convar.h" +#include "tier1/cmd.h" +#include "tier1/convar.h" #include "squirrel/squirrel.h" #include "engine/hoststate.h" #include "engine/r2engine.h" diff --git a/primedev/squirrel/squirrel.cpp b/primedev/squirrel/squirrel.cpp index 43e43398a..3d9eef720 100644 --- a/primedev/squirrel/squirrel.cpp +++ b/primedev/squirrel/squirrel.cpp @@ -1,7 +1,7 @@ #include "squirrel.h" #include "mods/modsavefiles.h" #include "logging/logging.h" -#include "core/convar/concommand.h" +#include "tier1/cmd.h" #include "mods/modmanager.h" #include "dedicated/dedicated.h" #include "engine/r2engine.h" diff --git a/primedev/core/convar/concommand.cpp b/primedev/tier1/cmd.cpp similarity index 99% rename from primedev/core/convar/concommand.cpp rename to primedev/tier1/cmd.cpp index 6e09ef918..4b1c2de22 100644 --- a/primedev/core/convar/concommand.cpp +++ b/primedev/tier1/cmd.cpp @@ -1,4 +1,4 @@ -#include "concommand.h" +#include "tier1/cmd.h" #include "shared/misccommands.h" #include "engine/r2engine.h" diff --git a/primedev/core/convar/concommand.h b/primedev/tier1/cmd.h similarity index 100% rename from primedev/core/convar/concommand.h rename to primedev/tier1/cmd.h diff --git a/primedev/core/convar/convar.cpp b/primedev/tier1/convar.cpp similarity index 100% rename from primedev/core/convar/convar.cpp rename to primedev/tier1/convar.cpp diff --git a/primedev/core/convar/convar.h b/primedev/tier1/convar.h similarity index 99% rename from primedev/core/convar/convar.h rename to primedev/tier1/convar.h index f0366b466..a6276e5f3 100644 --- a/primedev/core/convar/convar.h +++ b/primedev/tier1/convar.h @@ -2,7 +2,7 @@ #include "core/sourceinterface.h" #include "core/math/color.h" #include "cvar.h" -#include "concommand.h" +#include "tier1/cmd.h" // taken directly from iconvar.h diff --git a/primedev/core/convar/cvar.cpp b/primedev/tier1/cvar.cpp similarity index 97% rename from primedev/core/convar/cvar.cpp rename to primedev/tier1/cvar.cpp index aa5f03653..5f910a796 100644 --- a/primedev/core/convar/cvar.cpp +++ b/primedev/tier1/cvar.cpp @@ -1,6 +1,6 @@ #include "cvar.h" #include "convar.h" -#include "concommand.h" +#include "tier1/cmd.h" //----------------------------------------------------------------------------- // Purpose: returns all ConVars diff --git a/primedev/core/convar/cvar.h b/primedev/tier1/cvar.h similarity index 100% rename from primedev/core/convar/cvar.h rename to primedev/tier1/cvar.h diff --git a/primedev/util/printcommands.cpp b/primedev/util/printcommands.cpp index 34d566669..02aa3a07e 100644 --- a/primedev/util/printcommands.cpp +++ b/primedev/util/printcommands.cpp @@ -1,7 +1,7 @@ #include "printcommands.h" -#include "core/convar/cvar.h" -#include "core/convar/convar.h" -#include "core/convar/concommand.h" +#include "tier1/cvar.h" +#include "tier1/convar.h" +#include "tier1/cmd.h" void PrintCommandHelpDialogue(const ConCommandBase* command, const char* name) { diff --git a/primedev/util/printcommands.h b/primedev/util/printcommands.h index cb72e5cc4..f7cd287f5 100644 --- a/primedev/util/printcommands.h +++ b/primedev/util/printcommands.h @@ -1,5 +1,5 @@ #pragma once -#include "core/convar/concommand.h" +#include "tier1/cmd.h" void PrintCommandHelpDialogue(const ConCommandBase* command, const char* name); void TryPrintCvarHelpForCommand(const char* pCommand); diff --git a/primedev/util/printmaps.cpp b/primedev/util/printmaps.cpp index d32536051..c77e4218a 100644 --- a/primedev/util/printmaps.cpp +++ b/primedev/util/printmaps.cpp @@ -1,6 +1,6 @@ #include "printmaps.h" -#include "core/convar/convar.h" -#include "core/convar/concommand.h" +#include "tier1/convar.h" +#include "tier1/cmd.h" #include "mods/modmanager.h" #include "core/tier0.h" #include "engine/r2engine.h"