From 5c899c135178a0fb13c45ab8bbce33835490e95c Mon Sep 17 00:00:00 2001 From: ASpoonPlaysGames <66967891+ASpoonPlaysGames@users.noreply.github.com> Date: Fri, 22 Dec 2023 19:32:20 +0000 Subject: [PATCH] i think i reached the end of the dependency rabbit hole --- primedev/client/entity_client_tools.cpp | 3 ++- primedev/core/tier1.cpp | 5 ++++- primedev/core/tier1.h | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/primedev/client/entity_client_tools.cpp b/primedev/client/entity_client_tools.cpp index d9b62ba35..d6f0be115 100644 --- a/primedev/client/entity_client_tools.cpp +++ b/primedev/client/entity_client_tools.cpp @@ -1,9 +1,10 @@ #include "toolframework/itoolentity.h" #include "client/cdll_client_int.h" +#include "core/tier1.h" class CClientTools : public IClientTools { - public: +public: }; ON_DLL_LOAD("client.dll", ClientClientTools, (CModule module)) diff --git a/primedev/core/tier1.cpp b/primedev/core/tier1.cpp index 3b142981f..a29954960 100644 --- a/primedev/core/tier1.cpp +++ b/primedev/core/tier1.cpp @@ -8,7 +8,10 @@ CMemoryAddress Sys_GetFactoryPtr(const std::string& svModuleName, const std::str HMODULE hModule = GetModuleHandleA(svModuleName.c_str()); if (!hModule) - Error(eLog::NS, EXIT_FAILURE, "Failed to get module handle of '%s'!\n", svModuleName.c_str()); + { + spdlog::error("Failed to get module handle of '{}'!", svModuleName.c_str()); + exit(EXIT_FAILURE); + } CreateInterfaceFn fnCreateInterface = reinterpret_cast(GetProcAddress(hModule, CREATEINTERFACE_PROCNAME)); diff --git a/primedev/core/tier1.h b/primedev/core/tier1.h index 7291021e1..5be582744 100644 --- a/primedev/core/tier1.h +++ b/primedev/core/tier1.h @@ -9,4 +9,4 @@ typedef void* (*CreateInterfaceFn)(const char* pName, int* pReturnCode); -CMemoryAddress Sys_GetFactoryPtr(const std::string& svModuleName, const std::string& svFact +CMemoryAddress Sys_GetFactoryPtr(const std::string& svModuleName, const std::string& svFact);