reorganize sources a bit

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)

include/angles.hpp

@@ -7,7 +7,7 @@
 
 #pragma once
 
-#include <logging.hpp>
+#include <core/logging.hpp>
 #include "common.hpp"
 
 namespace angles

include/common.hpp

@@ -46,7 +46,7 @@
 #include "timer.hpp"
 #include "averager.hpp"
 
-#include "macros.hpp"
+#include "core/macros.hpp"
 #include <visual/colors.hpp>
 
 #if ENABLE_VISUALS
@@ -62,8 +62,8 @@
 
 #endif
 
-#include "profiler.hpp"
-#include "offsets.hpp"
+#include "core/profiler.hpp"
+#include "core/offsets.hpp"
 #include <entitycache.hpp>
 #include "hoovy.hpp"
 #include <enums.hpp>
@@ -74,17 +74,17 @@
 #include "globals.h"
 #include <helpers.hpp>
 #include "playerlist.hpp"
-#include <interfaces.hpp>
+#include <core/interfaces.hpp>
 #include <localplayer.hpp>
 #include <conditions.hpp>
-#include <logging.hpp>
+#include <core/logging.hpp>
 #include <targethelper.hpp>
 #include "playerresource.h"
 #include "usercmd.hpp"
 #include "trace.hpp"
-#include <cvwrapper.hpp>
-#include "netvars.hpp"
-#include "vfunc.hpp"
+#include <core/cvwrapper.hpp>
+#include "core/netvars.hpp"
+#include "core/vfunc.hpp"
 #include "hooks.hpp"
 #include <prediction.hpp>
 #include <conditions.hpp>
@@ -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 <sdk.hpp>
+#include <core/sdk.hpp>
 
 template <typename T> constexpr T _clamp(T _min, T _max, T _val)
 {

include/conditions.hpp

@@ -8,7 +8,7 @@
 #pragma once
 
 #include <entitycache.hpp>
-#include "netvars.hpp"
+#include "core/netvars.hpp"
 #include "gameinfo.hpp"
 
 // So, tf2 actually stores cond netvars sequentionally, that's pretty good.

include/copypasted/CDumper.hpp

@@ -12,7 +12,7 @@
 #include <dt_common.h>
 #include <client_class.h>
 
-#include <logging.hpp>
+#include <core/logging.hpp>
 
 class CDumper
 {

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}")

include/copypasted/Netvar.h

@@ -4,7 +4,7 @@
 //#include <cstring>
 #include <string.h>
 #include <memory>
-#include "logging.hpp"
+#include "core/logging.hpp"
 
 // this and the cpp are creds to "Altimor"
 

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")

include/core/cvwrapper.hpp

@@ -9,8 +9,8 @@
 
 class ConVar;
 
-#include <sdk.hpp>
-#include <interfaces.hpp>
+#include <core/sdk.hpp>
+#include <core/interfaces.hpp>
 
 #include <string>
 #include <vector>

include/core/interfaces.hpp

@@ -7,7 +7,7 @@
 
 #pragma once
 
-#include <sharedobj.hpp>
+#include <core/sharedobj.hpp>
 #include <string>
 
 namespace vgui

include/core/netvars.hpp

@@ -7,7 +7,7 @@
 
 #pragma once
 
-#include <logging.hpp>
+#include <core/logging.hpp>
 
 class IClientEntity;
 

include/entitycache.hpp

@@ -15,7 +15,7 @@
 #include <icliententitylist.h>
 #include <cdll_int.h>
 #include <enums.hpp>
-#include <interfaces.hpp>
+#include <core/interfaces.hpp>
 #include <itemtypes.hpp>
 
 struct matrix3x4_t;

include/gameinfo.hpp

@@ -8,7 +8,7 @@
 #pragma once
 
 #include "config.h"
-#include "macros.hpp"
+#include "core/macros.hpp"
 
 extern int g_AppID;
 

include/helpers.hpp

@@ -26,14 +26,14 @@ void SetCVarInterface(ICvar *iface);
 #include <enums.hpp>
 #include <conditions.hpp>
 #include <entitycache.hpp>
-#include <logging.hpp>
+#include <core/logging.hpp>
 
 #include <string>
 #include <sstream>
 #include <vector>
 #include <mutex>
 
-#include <sdk.hpp>
+#include <core/sdk.hpp>
 
 // typedef void ( *FnCommandCallback_t )( const CCommand &command );
 

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}")

include/sdk/HUD.h

@@ -7,9 +7,9 @@
 
 #pragma once
 
-#include <logging.hpp>
+#include <core/logging.hpp>
 #include <utlvector.h>
-#include "vfunc.hpp"
+#include "core/vfunc.hpp"
 
 class CHudBaseChat
 {

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
 {

include/visual/EffectGlow.hpp

@@ -8,7 +8,7 @@
 #pragma once
 
 #include "common.hpp"
-#include "sdk.hpp"
+#include "core/sdk.hpp"
 
 namespace effect_glow
 {

include/visual/menu/CBaseWidget.h

@@ -12,7 +12,7 @@
 #include <vector>
 #include <cstring>
 #include <algorithm>
-#include "logging.hpp"
+#include "core/logging.hpp"
 #include <KeyValues.h>
 
 class CBaseWidget : public virtual IWidget

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)

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")

src/core/entry.cpp

@@ -5,7 +5,7 @@
  *      Author: nullifiedcat
  */
 
-#include <logging.hpp>
+#include <core/logging.hpp>
 #include <pthread.h>
 
 #include "hack.hpp"

src/core/interfaces.cpp

@@ -6,7 +6,7 @@
  */
 
 #include "common.hpp"
-#include "sharedobj.hpp"
+#include "core/sharedobj.hpp"
 
 #include <unistd.h>
 

src/hacks/Misc.cpp

@@ -13,7 +13,7 @@
 #include <link.h>
 #include <hacks/AntiAim.hpp>
 
-#include "sharedobj.hpp"
+#include "core/sharedobj.hpp"
 
 #include "hack.hpp"
 #include "common.hpp"

src/https_request.cpp

@@ -5,7 +5,7 @@
  *      Author: nullifiedcat
  */
 
-#include <logging.hpp>
+#include <core/logging.hpp>
 #include "https_request.hpp"
 
 #include <string.h>

src/reclasses/CTFGCClientSystem.cpp

@@ -6,7 +6,7 @@
  */
 
 #include "common.hpp"
-#include "e8call.hpp"
+#include "core/e8call.hpp"
 
 using namespace re;
 

src/reclasses/CTFParty.cpp

@@ -6,7 +6,7 @@
  */
 
 #include "common.hpp"
-#include "e8call.hpp"
+#include "core/e8call.hpp"
 
 re::CTFParty *re::CTFParty::GetParty()
 {

src/reclasses/CTFPartyClient.cpp

@@ -6,7 +6,7 @@
  */
 
 #include "common.hpp"
-#include "e8call.hpp"
+#include "core/e8call.hpp"
 
 re::CTFPartyClient *re::CTFPartyClient::GTFPartyClient()
 {

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")
+        "${CMAKE_CURRENT_LIST_DIR}/utlbuffer.cpp"
+        "${CMAKE_CURRENT_LIST_DIR}/netmessage.cpp")

src/sdk/HUD.cpp

@@ -5,7 +5,7 @@
  *      Author: nullifiedcat
  */
 
-#include <logging.hpp>
+#include <core/logging.hpp>
 #include "sdk/HUD.h"
 
 #include "copypasted/CSignature.h"

src/sdk/convar.cpp

@@ -29,8 +29,8 @@
 #define ALLOW_DEVELOPMENT_CVARS
 #endif
 
-#include <logging.hpp>
-#include <interfaces.hpp>
+#include <core/logging.hpp>
+#include <core/interfaces.hpp>
 
 //-----------------------------------------------------------------------------
 // Statically constructed list of ConCommandBases,

src/sdk/netmessage.cpp

@@ -5,7 +5,7 @@
  *      Author: nullifiedcat
  */
 
-#include <logging.hpp>
+#include <core/logging.hpp>
 #include <netmessage.hpp>
 #include "common.hpp"
 

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;

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)

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