From 43cf73ef2b37f2746ba661cf665d7d590158b667 Mon Sep 17 00:00:00 2001 From: Jenny White Date: Sun, 29 Apr 2018 15:58:36 +0300 Subject: [PATCH] reorganize sources a bit --- include/CMakeLists.txt | 15 +-------------- include/angles.hpp | 2 +- include/common.hpp | 20 ++++++++++---------- include/conditions.hpp | 2 +- include/{ => copypasted}/CDumper.hpp | 2 +- include/copypasted/CMakeLists.txt | 1 + include/copypasted/Netvar.h | 2 +- include/core/CMakeLists.txt | 12 ++++++++++++ include/{ => core}/cvwrapper.hpp | 4 ++-- include/{ => core}/e8call.hpp | 0 include/{ => core}/interfaces.hpp | 2 +- include/{ => core}/logging.hpp | 0 include/{ => core}/macros.hpp | 0 include/{ => core}/netvars.hpp | 2 +- include/{ => core}/offsets.hpp | 0 include/{ => core}/profiler.hpp | 0 include/{ => core}/sdk.hpp | 0 include/{ => core}/sharedobj.hpp | 0 include/{ => core}/vfunc.hpp | 0 include/entitycache.hpp | 2 +- include/gameinfo.hpp | 2 +- include/helpers.hpp | 4 ++-- include/sdk/CMakeLists.txt | 4 +++- include/sdk/HUD.h | 4 ++-- include/{ => sdk}/netmessage.hpp | 0 include/{ => sdk}/usercmd.hpp | 0 include/visual/EffectChams.hpp | 2 +- include/visual/EffectGlow.hpp | 2 +- include/visual/menu/CBaseWidget.h | 2 +- src/CMakeLists.txt | 10 +--------- src/core/CMakeLists.txt | 9 +++++++++ src/{ => core}/cvwrapper.cpp | 0 src/{ => core}/entry.cpp | 2 +- src/{ => core}/init.cpp | 0 src/{ => core}/interfaces.cpp | 2 +- src/{ => core}/logging.cpp | 0 src/{ => core}/netvars.cpp | 0 src/{ => core}/profiler.cpp | 0 src/{ => core}/sharedobj.cpp | 0 src/hacks/Misc.cpp | 2 +- src/https_request.cpp | 2 +- src/reclasses/CTFGCClientSystem.cpp | 2 +- src/reclasses/CTFParty.cpp | 2 +- src/reclasses/CTFPartyClient.cpp | 2 +- src/sdk/CMakeLists.txt | 3 ++- src/sdk/HUD.cpp | 2 +- src/sdk/convar.cpp | 4 ++-- src/{ => sdk}/netmessage.cpp | 2 +- src/visual/menu/CBaseContainer.cpp | 2 +- src/visual/menu/CTextLabel.cpp | 2 +- src/visual/menu/GUI.cpp | 2 +- 51 files changed, 70 insertions(+), 66 deletions(-) rename include/{ => copypasted}/CDumper.hpp (98%) create mode 100644 include/core/CMakeLists.txt rename include/{ => core}/cvwrapper.hpp (98%) rename include/{ => core}/e8call.hpp (100%) rename include/{ => core}/interfaces.hpp (98%) rename include/{ => core}/logging.hpp (100%) rename include/{ => core}/macros.hpp (100%) rename include/{ => core}/netvars.hpp (99%) rename include/{ => core}/offsets.hpp (100%) rename include/{ => core}/profiler.hpp (100%) rename include/{ => core}/sdk.hpp (100%) rename include/{ => core}/sharedobj.hpp (100%) rename include/{ => core}/vfunc.hpp (100%) rename include/{ => sdk}/netmessage.hpp (100%) rename include/{ => sdk}/usercmd.hpp (100%) create mode 100644 src/core/CMakeLists.txt rename src/{ => core}/cvwrapper.cpp (100%) rename src/{ => core}/entry.cpp (97%) rename src/{ => core}/init.cpp (100%) rename src/{ => core}/interfaces.cpp (99%) rename src/{ => core}/logging.cpp (100%) rename src/{ => core}/netvars.cpp (100%) rename src/{ => core}/profiler.cpp (100%) rename src/{ => core}/sharedobj.cpp (100%) rename src/{ => sdk}/netmessage.cpp (99%) diff --git a/include/CMakeLists.txt b/include/CMakeLists.txt index 64b346b2..1ba56a18 100644 --- a/include/CMakeLists.txt +++ b/include/CMakeLists.txt @@ -3,14 +3,11 @@ target_sources(cathook PRIVATE "${CMAKE_CURRENT_LIST_DIR}/averager.hpp" "${CMAKE_CURRENT_LIST_DIR}/backpacktf.hpp" "${CMAKE_CURRENT_LIST_DIR}/base64.hpp" - "${CMAKE_CURRENT_LIST_DIR}/CDumper.hpp" "${CMAKE_CURRENT_LIST_DIR}/chatlog.hpp" "${CMAKE_CURRENT_LIST_DIR}/chatstack.hpp" "${CMAKE_CURRENT_LIST_DIR}/common.hpp" "${CMAKE_CURRENT_LIST_DIR}/conditions.hpp" "${CMAKE_CURRENT_LIST_DIR}/crits.hpp" - "${CMAKE_CURRENT_LIST_DIR}/cvwrapper.hpp" - "${CMAKE_CURRENT_LIST_DIR}/e8call.hpp" "${CMAKE_CURRENT_LIST_DIR}/entitycache.hpp" "${CMAKE_CURRENT_LIST_DIR}/entityhitboxcache.hpp" "${CMAKE_CURRENT_LIST_DIR}/enums.hpp" @@ -24,38 +21,28 @@ target_sources(cathook PRIVATE "${CMAKE_CURRENT_LIST_DIR}/hoovy.hpp" "${CMAKE_CURRENT_LIST_DIR}/https_request.hpp" "${CMAKE_CURRENT_LIST_DIR}/init.hpp" - "${CMAKE_CURRENT_LIST_DIR}/interfaces.hpp" "${CMAKE_CURRENT_LIST_DIR}/ipc.hpp" "${CMAKE_CURRENT_LIST_DIR}/itemtypes.hpp" "${CMAKE_CURRENT_LIST_DIR}/json.hpp" "${CMAKE_CURRENT_LIST_DIR}/localplayer.hpp" - "${CMAKE_CURRENT_LIST_DIR}/logging.hpp" - "${CMAKE_CURRENT_LIST_DIR}/macros.hpp" - "${CMAKE_CURRENT_LIST_DIR}/netmessage.hpp" - "${CMAKE_CURRENT_LIST_DIR}/netvars.hpp" - "${CMAKE_CURRENT_LIST_DIR}/offsets.hpp" "${CMAKE_CURRENT_LIST_DIR}/playerlist.hpp" "${CMAKE_CURRENT_LIST_DIR}/playerresource.h" "${CMAKE_CURRENT_LIST_DIR}/prediction.hpp" - "${CMAKE_CURRENT_LIST_DIR}/profiler.hpp" "${CMAKE_CURRENT_LIST_DIR}/projlogging.hpp" "${CMAKE_CURRENT_LIST_DIR}/sconvars.hpp" - "${CMAKE_CURRENT_LIST_DIR}/sdk.hpp" - "${CMAKE_CURRENT_LIST_DIR}/sharedobj.hpp" "${CMAKE_CURRENT_LIST_DIR}/targethelper.hpp" "${CMAKE_CURRENT_LIST_DIR}/textfile.hpp" "${CMAKE_CURRENT_LIST_DIR}/textmode.hpp" "${CMAKE_CURRENT_LIST_DIR}/tfmm.hpp" "${CMAKE_CURRENT_LIST_DIR}/timer.hpp" "${CMAKE_CURRENT_LIST_DIR}/trace.hpp" - "${CMAKE_CURRENT_LIST_DIR}/usercmd.hpp" "${CMAKE_CURRENT_LIST_DIR}/velocity.hpp" - "${CMAKE_CURRENT_LIST_DIR}/vfunc.hpp" "${CMAKE_CURRENT_LIST_DIR}/votelogger.hpp" "${CMAKE_CURRENT_LIST_DIR}/MiscTemporary.hpp") target_include_directories(cathook PRIVATE "${CMAKE_CURRENT_LIST_DIR}") +add_subdirectory(core) add_subdirectory(classinfo) add_subdirectory(copypasted) add_subdirectory(hacks) diff --git a/include/angles.hpp b/include/angles.hpp index 990c5d1f..ef574097 100755 --- a/include/angles.hpp +++ b/include/angles.hpp @@ -7,7 +7,7 @@ #pragma once -#include +#include #include "common.hpp" namespace angles diff --git a/include/common.hpp b/include/common.hpp index 6153552b..b128b13c 100755 --- a/include/common.hpp +++ b/include/common.hpp @@ -46,7 +46,7 @@ #include "timer.hpp" #include "averager.hpp" -#include "macros.hpp" +#include "core/macros.hpp" #include #if ENABLE_VISUALS @@ -62,8 +62,8 @@ #endif -#include "profiler.hpp" -#include "offsets.hpp" +#include "core/profiler.hpp" +#include "core/offsets.hpp" #include #include "hoovy.hpp" #include @@ -74,17 +74,17 @@ #include "globals.h" #include #include "playerlist.hpp" -#include +#include #include #include -#include +#include #include #include "playerresource.h" #include "usercmd.hpp" #include "trace.hpp" -#include -#include "netvars.hpp" -#include "vfunc.hpp" +#include +#include "core/netvars.hpp" +#include "core/vfunc.hpp" #include "hooks.hpp" #include #include @@ -99,7 +99,7 @@ #include "crits.hpp" #include "textmode.hpp" #include "backpacktf.hpp" -#include "sharedobj.hpp" +#include "core/sharedobj.hpp" #include "init.hpp" #include "reclasses/reclasses.hpp" @@ -110,7 +110,7 @@ #include "GUI.h" #endif -#include +#include template constexpr T _clamp(T _min, T _max, T _val) { diff --git a/include/conditions.hpp b/include/conditions.hpp index 5020ed20..f2b8c6f2 100755 --- a/include/conditions.hpp +++ b/include/conditions.hpp @@ -8,7 +8,7 @@ #pragma once #include -#include "netvars.hpp" +#include "core/netvars.hpp" #include "gameinfo.hpp" // So, tf2 actually stores cond netvars sequentionally, that's pretty good. diff --git a/include/CDumper.hpp b/include/copypasted/CDumper.hpp similarity index 98% rename from include/CDumper.hpp rename to include/copypasted/CDumper.hpp index a7450ac1..2389416e 100755 --- a/include/CDumper.hpp +++ b/include/copypasted/CDumper.hpp @@ -12,7 +12,7 @@ #include #include -#include +#include class CDumper { diff --git a/include/copypasted/CMakeLists.txt b/include/copypasted/CMakeLists.txt index 20d1b4b2..e8ee2a96 100644 --- a/include/copypasted/CMakeLists.txt +++ b/include/copypasted/CMakeLists.txt @@ -1,5 +1,6 @@ target_sources(cathook PRIVATE "${CMAKE_CURRENT_LIST_DIR}/CSignature.h" + "${CMAKE_CURRENT_LIST_DIR}/CDumper.hpp" "${CMAKE_CURRENT_LIST_DIR}/Netvar.h") target_include_directories(cathook PRIVATE "${CMAKE_CURRENT_LIST_DIR}") \ No newline at end of file diff --git a/include/copypasted/Netvar.h b/include/copypasted/Netvar.h index 60336c9e..9192d4ef 100755 --- a/include/copypasted/Netvar.h +++ b/include/copypasted/Netvar.h @@ -4,7 +4,7 @@ //#include #include #include -#include "logging.hpp" +#include "core/logging.hpp" // this and the cpp are creds to "Altimor" diff --git a/include/core/CMakeLists.txt b/include/core/CMakeLists.txt new file mode 100644 index 00000000..7681140a --- /dev/null +++ b/include/core/CMakeLists.txt @@ -0,0 +1,12 @@ +target_sources(cathook PRIVATE + "${CMAKE_CURRENT_LIST_DIR}/cvwrapper.hpp" + "${CMAKE_CURRENT_LIST_DIR}/e8call.hpp" + "${CMAKE_CURRENT_LIST_DIR}/interfaces.hpp" + "${CMAKE_CURRENT_LIST_DIR}/logging.hpp" + "${CMAKE_CURRENT_LIST_DIR}/macros.hpp" + "${CMAKE_CURRENT_LIST_DIR}/netvars.hpp" + "${CMAKE_CURRENT_LIST_DIR}/offsets.hpp" + "${CMAKE_CURRENT_LIST_DIR}/profiler.hpp" + "${CMAKE_CURRENT_LIST_DIR}/sdk.hpp" + "${CMAKE_CURRENT_LIST_DIR}/sharedobj.hpp" + "${CMAKE_CURRENT_LIST_DIR}/vfunc.hpp") \ No newline at end of file diff --git a/include/cvwrapper.hpp b/include/core/cvwrapper.hpp similarity index 98% rename from include/cvwrapper.hpp rename to include/core/cvwrapper.hpp index f27c109f..01d937f7 100755 --- a/include/cvwrapper.hpp +++ b/include/core/cvwrapper.hpp @@ -9,8 +9,8 @@ class ConVar; -#include -#include +#include +#include #include #include diff --git a/include/e8call.hpp b/include/core/e8call.hpp similarity index 100% rename from include/e8call.hpp rename to include/core/e8call.hpp diff --git a/include/interfaces.hpp b/include/core/interfaces.hpp similarity index 98% rename from include/interfaces.hpp rename to include/core/interfaces.hpp index d1518acd..ea95d51d 100755 --- a/include/interfaces.hpp +++ b/include/core/interfaces.hpp @@ -7,7 +7,7 @@ #pragma once -#include +#include #include namespace vgui diff --git a/include/logging.hpp b/include/core/logging.hpp similarity index 100% rename from include/logging.hpp rename to include/core/logging.hpp diff --git a/include/macros.hpp b/include/core/macros.hpp similarity index 100% rename from include/macros.hpp rename to include/core/macros.hpp diff --git a/include/netvars.hpp b/include/core/netvars.hpp similarity index 99% rename from include/netvars.hpp rename to include/core/netvars.hpp index 4bb5d556..cd74af59 100755 --- a/include/netvars.hpp +++ b/include/core/netvars.hpp @@ -7,7 +7,7 @@ #pragma once -#include +#include class IClientEntity; diff --git a/include/offsets.hpp b/include/core/offsets.hpp similarity index 100% rename from include/offsets.hpp rename to include/core/offsets.hpp diff --git a/include/profiler.hpp b/include/core/profiler.hpp similarity index 100% rename from include/profiler.hpp rename to include/core/profiler.hpp diff --git a/include/sdk.hpp b/include/core/sdk.hpp similarity index 100% rename from include/sdk.hpp rename to include/core/sdk.hpp diff --git a/include/sharedobj.hpp b/include/core/sharedobj.hpp similarity index 100% rename from include/sharedobj.hpp rename to include/core/sharedobj.hpp diff --git a/include/vfunc.hpp b/include/core/vfunc.hpp similarity index 100% rename from include/vfunc.hpp rename to include/core/vfunc.hpp diff --git a/include/entitycache.hpp b/include/entitycache.hpp index fe79b49b..42647fed 100755 --- a/include/entitycache.hpp +++ b/include/entitycache.hpp @@ -15,7 +15,7 @@ #include #include #include -#include +#include #include struct matrix3x4_t; diff --git a/include/gameinfo.hpp b/include/gameinfo.hpp index 865ea6e5..229def9a 100755 --- a/include/gameinfo.hpp +++ b/include/gameinfo.hpp @@ -8,7 +8,7 @@ #pragma once #include "config.h" -#include "macros.hpp" +#include "core/macros.hpp" extern int g_AppID; diff --git a/include/helpers.hpp b/include/helpers.hpp index d4e201d3..e2330f55 100755 --- a/include/helpers.hpp +++ b/include/helpers.hpp @@ -26,14 +26,14 @@ void SetCVarInterface(ICvar *iface); #include #include #include -#include +#include #include #include #include #include -#include +#include // typedef void ( *FnCommandCallback_t )( const CCommand &command ); diff --git a/include/sdk/CMakeLists.txt b/include/sdk/CMakeLists.txt index 554a9b21..bb75e6ee 100644 --- a/include/sdk/CMakeLists.txt +++ b/include/sdk/CMakeLists.txt @@ -5,6 +5,8 @@ target_sources(cathook PRIVATE "${CMAKE_CURRENT_LIST_DIR}/iinput.h" "${CMAKE_CURRENT_LIST_DIR}/imaterialsystemfixed.h" "${CMAKE_CURRENT_LIST_DIR}/in_buttons.h" - "${CMAKE_CURRENT_LIST_DIR}/ScreenSpaceEffects.h") + "${CMAKE_CURRENT_LIST_DIR}/ScreenSpaceEffects.h" + "${CMAKE_CURRENT_LIST_DIR}/netmessage.hpp" + "${CMAKE_CURRENT_LIST_DIR}/usercmd.hpp") target_include_directories(cathook PRIVATE "${CMAKE_CURRENT_LIST_DIR}") \ No newline at end of file diff --git a/include/sdk/HUD.h b/include/sdk/HUD.h index 563f54fd..ecd69d04 100755 --- a/include/sdk/HUD.h +++ b/include/sdk/HUD.h @@ -7,9 +7,9 @@ #pragma once -#include +#include #include -#include "vfunc.hpp" +#include "core/vfunc.hpp" class CHudBaseChat { diff --git a/include/netmessage.hpp b/include/sdk/netmessage.hpp similarity index 100% rename from include/netmessage.hpp rename to include/sdk/netmessage.hpp diff --git a/include/usercmd.hpp b/include/sdk/usercmd.hpp similarity index 100% rename from include/usercmd.hpp rename to include/sdk/usercmd.hpp diff --git a/include/visual/EffectChams.hpp b/include/visual/EffectChams.hpp index 6c214141..d94fc032 100644 --- a/include/visual/EffectChams.hpp +++ b/include/visual/EffectChams.hpp @@ -9,7 +9,7 @@ #include "common.hpp" #include "sdk/ScreenSpaceEffects.h" -#include "sdk.hpp" +#include "core/sdk.hpp" namespace effect_chams { diff --git a/include/visual/EffectGlow.hpp b/include/visual/EffectGlow.hpp index 32aef158..eec68346 100755 --- a/include/visual/EffectGlow.hpp +++ b/include/visual/EffectGlow.hpp @@ -8,7 +8,7 @@ #pragma once #include "common.hpp" -#include "sdk.hpp" +#include "core/sdk.hpp" namespace effect_glow { diff --git a/include/visual/menu/CBaseWidget.h b/include/visual/menu/CBaseWidget.h index 0c5f749a..53bfe8c8 100755 --- a/include/visual/menu/CBaseWidget.h +++ b/include/visual/menu/CBaseWidget.h @@ -12,7 +12,7 @@ #include #include #include -#include "logging.hpp" +#include "core/logging.hpp" #include class CBaseWidget : public virtual IWidget diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index e23bd60e..b653f3b3 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -5,10 +5,8 @@ target_sources(cathook PRIVATE "${CMAKE_CURRENT_LIST_DIR}/chatstack.cpp" "${CMAKE_CURRENT_LIST_DIR}/conditions.cpp" "${CMAKE_CURRENT_LIST_DIR}/crits.cpp" - "${CMAKE_CURRENT_LIST_DIR}/cvwrapper.cpp" "${CMAKE_CURRENT_LIST_DIR}/entitycache.cpp" "${CMAKE_CURRENT_LIST_DIR}/entityhitboxcache.cpp" - "${CMAKE_CURRENT_LIST_DIR}/entry.cpp" "${CMAKE_CURRENT_LIST_DIR}/globals.cpp" "${CMAKE_CURRENT_LIST_DIR}/hack.cpp" "${CMAKE_CURRENT_LIST_DIR}/headshake.cpp" @@ -17,21 +15,14 @@ target_sources(cathook PRIVATE "${CMAKE_CURRENT_LIST_DIR}/hooks.cpp" "${CMAKE_CURRENT_LIST_DIR}/hoovy.cpp" "${CMAKE_CURRENT_LIST_DIR}/https_request.cpp" - "${CMAKE_CURRENT_LIST_DIR}/init.cpp" - "${CMAKE_CURRENT_LIST_DIR}/interfaces.cpp" "${CMAKE_CURRENT_LIST_DIR}/ipc.cpp" "${CMAKE_CURRENT_LIST_DIR}/itemtypes.cpp" "${CMAKE_CURRENT_LIST_DIR}/localplayer.cpp" - "${CMAKE_CURRENT_LIST_DIR}/logging.cpp" - "${CMAKE_CURRENT_LIST_DIR}/netmessage.cpp" - "${CMAKE_CURRENT_LIST_DIR}/netvars.cpp" "${CMAKE_CURRENT_LIST_DIR}/playerlist.cpp" "${CMAKE_CURRENT_LIST_DIR}/playerresource.cpp" "${CMAKE_CURRENT_LIST_DIR}/prediction.cpp" - "${CMAKE_CURRENT_LIST_DIR}/profiler.cpp" "${CMAKE_CURRENT_LIST_DIR}/projlogging.cpp" "${CMAKE_CURRENT_LIST_DIR}/sconvars.cpp" - "${CMAKE_CURRENT_LIST_DIR}/sharedobj.cpp" "${CMAKE_CURRENT_LIST_DIR}/targethelper.cpp" "${CMAKE_CURRENT_LIST_DIR}/textfile.cpp" "${CMAKE_CURRENT_LIST_DIR}/textmode.cpp" @@ -42,6 +33,7 @@ target_sources(cathook PRIVATE "${CMAKE_CURRENT_LIST_DIR}/votelogger.cpp" "${CMAKE_CURRENT_LIST_DIR}/MiscTemporary.cpp") +add_subdirectory(core) add_subdirectory(classinfo) add_subdirectory(copypasted) add_subdirectory(hacks) diff --git a/src/core/CMakeLists.txt b/src/core/CMakeLists.txt new file mode 100644 index 00000000..181b086c --- /dev/null +++ b/src/core/CMakeLists.txt @@ -0,0 +1,9 @@ +target_sources(cathook PRIVATE + "${CMAKE_CURRENT_LIST_DIR}/cvwrapper.cpp" + "${CMAKE_CURRENT_LIST_DIR}/entry.cpp" + "${CMAKE_CURRENT_LIST_DIR}/init.cpp" + "${CMAKE_CURRENT_LIST_DIR}/interfaces.cpp" + "${CMAKE_CURRENT_LIST_DIR}/logging.cpp" + "${CMAKE_CURRENT_LIST_DIR}/netvars.cpp" + "${CMAKE_CURRENT_LIST_DIR}/profiler.cpp" + "${CMAKE_CURRENT_LIST_DIR}/sharedobj.cpp") \ No newline at end of file diff --git a/src/cvwrapper.cpp b/src/core/cvwrapper.cpp similarity index 100% rename from src/cvwrapper.cpp rename to src/core/cvwrapper.cpp diff --git a/src/entry.cpp b/src/core/entry.cpp similarity index 97% rename from src/entry.cpp rename to src/core/entry.cpp index f09e9be3..9a1081b8 100755 --- a/src/entry.cpp +++ b/src/core/entry.cpp @@ -5,7 +5,7 @@ * Author: nullifiedcat */ -#include +#include #include #include "hack.hpp" diff --git a/src/init.cpp b/src/core/init.cpp similarity index 100% rename from src/init.cpp rename to src/core/init.cpp diff --git a/src/interfaces.cpp b/src/core/interfaces.cpp similarity index 99% rename from src/interfaces.cpp rename to src/core/interfaces.cpp index dff030a3..ece03268 100755 --- a/src/interfaces.cpp +++ b/src/core/interfaces.cpp @@ -6,7 +6,7 @@ */ #include "common.hpp" -#include "sharedobj.hpp" +#include "core/sharedobj.hpp" #include diff --git a/src/logging.cpp b/src/core/logging.cpp similarity index 100% rename from src/logging.cpp rename to src/core/logging.cpp diff --git a/src/netvars.cpp b/src/core/netvars.cpp similarity index 100% rename from src/netvars.cpp rename to src/core/netvars.cpp diff --git a/src/profiler.cpp b/src/core/profiler.cpp similarity index 100% rename from src/profiler.cpp rename to src/core/profiler.cpp diff --git a/src/sharedobj.cpp b/src/core/sharedobj.cpp similarity index 100% rename from src/sharedobj.cpp rename to src/core/sharedobj.cpp diff --git a/src/hacks/Misc.cpp b/src/hacks/Misc.cpp index 547f23b5..1ada1975 100644 --- a/src/hacks/Misc.cpp +++ b/src/hacks/Misc.cpp @@ -13,7 +13,7 @@ #include #include -#include "sharedobj.hpp" +#include "core/sharedobj.hpp" #include "hack.hpp" #include "common.hpp" diff --git a/src/https_request.cpp b/src/https_request.cpp index b6baf41f..bef6cf47 100755 --- a/src/https_request.cpp +++ b/src/https_request.cpp @@ -5,7 +5,7 @@ * Author: nullifiedcat */ -#include +#include #include "https_request.hpp" #include diff --git a/src/reclasses/CTFGCClientSystem.cpp b/src/reclasses/CTFGCClientSystem.cpp index 02556add..8954bc34 100644 --- a/src/reclasses/CTFGCClientSystem.cpp +++ b/src/reclasses/CTFGCClientSystem.cpp @@ -6,7 +6,7 @@ */ #include "common.hpp" -#include "e8call.hpp" +#include "core/e8call.hpp" using namespace re; diff --git a/src/reclasses/CTFParty.cpp b/src/reclasses/CTFParty.cpp index 2d1fdb75..894b6b94 100755 --- a/src/reclasses/CTFParty.cpp +++ b/src/reclasses/CTFParty.cpp @@ -6,7 +6,7 @@ */ #include "common.hpp" -#include "e8call.hpp" +#include "core/e8call.hpp" re::CTFParty *re::CTFParty::GetParty() { diff --git a/src/reclasses/CTFPartyClient.cpp b/src/reclasses/CTFPartyClient.cpp index 951bdac3..b98f110c 100644 --- a/src/reclasses/CTFPartyClient.cpp +++ b/src/reclasses/CTFPartyClient.cpp @@ -6,7 +6,7 @@ */ #include "common.hpp" -#include "e8call.hpp" +#include "core/e8call.hpp" re::CTFPartyClient *re::CTFPartyClient::GTFPartyClient() { diff --git a/src/sdk/CMakeLists.txt b/src/sdk/CMakeLists.txt index 0bce3644..427e3738 100644 --- a/src/sdk/CMakeLists.txt +++ b/src/sdk/CMakeLists.txt @@ -5,4 +5,5 @@ target_sources(cathook PRIVATE "${CMAKE_CURRENT_LIST_DIR}/KeyValues.cpp" "${CMAKE_CURRENT_LIST_DIR}/MaterialSystemUtil.cpp" "${CMAKE_CURRENT_LIST_DIR}/tier1.cpp" - "${CMAKE_CURRENT_LIST_DIR}/utlbuffer.cpp") \ No newline at end of file + "${CMAKE_CURRENT_LIST_DIR}/utlbuffer.cpp" + "${CMAKE_CURRENT_LIST_DIR}/netmessage.cpp") \ No newline at end of file diff --git a/src/sdk/HUD.cpp b/src/sdk/HUD.cpp index 84a64870..8d3a723d 100755 --- a/src/sdk/HUD.cpp +++ b/src/sdk/HUD.cpp @@ -5,7 +5,7 @@ * Author: nullifiedcat */ -#include +#include #include "sdk/HUD.h" #include "copypasted/CSignature.h" diff --git a/src/sdk/convar.cpp b/src/sdk/convar.cpp index 16c61ad0..b5a5c44b 100755 --- a/src/sdk/convar.cpp +++ b/src/sdk/convar.cpp @@ -29,8 +29,8 @@ #define ALLOW_DEVELOPMENT_CVARS #endif -#include -#include +#include +#include //----------------------------------------------------------------------------- // Statically constructed list of ConCommandBases, diff --git a/src/netmessage.cpp b/src/sdk/netmessage.cpp similarity index 99% rename from src/netmessage.cpp rename to src/sdk/netmessage.cpp index 97c88063..867eb546 100755 --- a/src/netmessage.cpp +++ b/src/sdk/netmessage.cpp @@ -5,7 +5,7 @@ * Author: nullifiedcat */ -#include +#include #include #include "common.hpp" diff --git a/src/visual/menu/CBaseContainer.cpp b/src/visual/menu/CBaseContainer.cpp index 1ecade33..d68bf060 100755 --- a/src/visual/menu/CBaseContainer.cpp +++ b/src/visual/menu/CBaseContainer.cpp @@ -8,7 +8,7 @@ #include "menu/CBaseContainer.h" #include "menu/GUI.h" #include "common.hpp" -#include "sdk.hpp" +#include "core/sdk.hpp" class IMemAlloc; IMemAlloc *g_pMemAlloc = 0; diff --git a/src/visual/menu/CTextLabel.cpp b/src/visual/menu/CTextLabel.cpp index 2da8fe9e..3c61d0ac 100755 --- a/src/visual/menu/CTextLabel.cpp +++ b/src/visual/menu/CTextLabel.cpp @@ -8,7 +8,7 @@ #include "menu/CTextLabel.h" #include "common.hpp" -#include "sdk.hpp" +#include "core/sdk.hpp" #include "GUI.h" std::string WordWrap(std::string &in, int max, unsigned long font) diff --git a/src/visual/menu/GUI.cpp b/src/visual/menu/GUI.cpp index 5c2fa26b..313a87f0 100644 --- a/src/visual/menu/GUI.cpp +++ b/src/visual/menu/GUI.cpp @@ -9,7 +9,7 @@ #include "menu/IWidget.h" #include "common.hpp" -#include "sdk.hpp" +#include "core/sdk.hpp" #undef RootWindow