Merge remote-tracking branch 'origin/main' into experimental-bots-pr

1 files changed, 12 insertions, 25 deletions

diff --git a/NorthstarDLL/pch.h b/NorthstarDLL/pch.h
index 824aaee8..55ebba8b 100644
--- a/NorthstarDLL/pch.h
+++ b/NorthstarDLL/pch.h
@@ -9,7 +9,7 @@
 #define RAPIDJSON_HAS_STDSTRING 1
 
 // add headers that you want to pre-compile here
-#include "memalloc.h"
+#include "core/memalloc.h"
 
 #include <windows.h>
 #include <psapi.h>
@@ -20,32 +20,19 @@
 
 namespace fs = std::filesystem;
 
-#include "structs.h"
-#include "color.h"
+// clang-format off
+#define assert_msg(exp, msg) assert((exp, msg))
+//clang-format on
+
+#include "core/macros.h"
+
+#include "core/structs.h"
+#include "core/math/color.h"
 #include "spdlog/spdlog.h"
-#include "logging.h"
+#include "logging/logging.h"
 #include "MinHook.h"
 #include "libcurl/include/curl/curl.h"
-#include "hooks.h"
-#include "memory.h"
-
-template <typename ReturnType, typename... Args> ReturnType CallVFunc(int index, void* thisPtr, Args... args)
-{
-	return (*reinterpret_cast<ReturnType(__fastcall***)(void*, Args...)>(thisPtr))[index](thisPtr, args...);
-}
-
-template <typename T, size_t index, typename... Args> constexpr T CallVFunc_Alt(void* classBase, Args... args) noexcept
-{
-	return ((*(T(__thiscall***)(void*, Args...))(classBase))[index])(classBase, args...);
-}
-
-#define STR_HASH(s) (std::hash<std::string>()(s))
-
-// Example usage: M_VMETHOD(int, GetEntityIndex, 8, (CBaseEntity* ent), (this, ent))
-#define M_VMETHOD(returnType, name, index, args, argsRaw)                                                                                  \
-	FORCEINLINE returnType name args noexcept                                                                                              \
-	{                                                                                                                                      \
-		return CallVFunc_Alt<returnType, index> argsRaw;                                                                                   \
-	}
+#include "core/hooks.h"
+#include "core/memory.h"
 
 #endif