diff options
author | F1F7Y <64418963+F1F7Y@users.noreply.github.com> | 2024-10-06 09:59:22 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2024-10-06 09:59:22 +0200 |
commit | 8a29c5bbd05cf52007a8aa3ff833c8fed237a625 (patch) | |
tree | 82ab53d8ac22f264ead09b9ba46355badf4d7eee /primedev/core | |
parent | 71349f05b69923dbf091d27f8e256bcc3022e859 (diff) | |
download | NorthstarLauncher-8a29c5bbd05cf52007a8aa3ff833c8fed237a625.tar.gz NorthstarLauncher-8a29c5bbd05cf52007a8aa3ff833c8fed237a625.zip |
core: Remove unused SourceInterface class (#816)
Removes unused `SourceInterface` class, moves `InterfaceStatus` enum to `tier1.h`.
Diffstat (limited to 'primedev/core')
-rw-r--r-- | primedev/core/convar/convar.h | 1 | ||||
-rw-r--r-- | primedev/core/sourceinterface.cpp | 1 | ||||
-rw-r--r-- | primedev/core/sourceinterface.h | 32 | ||||
-rw-r--r-- | primedev/core/tier1.h | 6 |
4 files changed, 6 insertions, 34 deletions
diff --git a/primedev/core/convar/convar.h b/primedev/core/convar/convar.h index f0366b46..33a50c1c 100644 --- a/primedev/core/convar/convar.h +++ b/primedev/core/convar/convar.h @@ -1,5 +1,4 @@ #pragma once -#include "core/sourceinterface.h" #include "core/math/color.h" #include "cvar.h" #include "concommand.h" diff --git a/primedev/core/sourceinterface.cpp b/primedev/core/sourceinterface.cpp index 74e4a996..7ce33925 100644 --- a/primedev/core/sourceinterface.cpp +++ b/primedev/core/sourceinterface.cpp @@ -1,4 +1,3 @@ -#include "sourceinterface.h" #include "logging/sourceconsole.h" // really wanted to do a modular callback system here but honestly couldn't be bothered so hardcoding stuff for now: todo later diff --git a/primedev/core/sourceinterface.h b/primedev/core/sourceinterface.h deleted file mode 100644 index 730339da..00000000 --- a/primedev/core/sourceinterface.h +++ /dev/null @@ -1,32 +0,0 @@ -#pragma once -#include <string> - -// interface return status -enum class InterfaceStatus : int -{ - IFACE_OK = 0, - IFACE_FAILED, -}; - -// literally just copied from ttf2sdk definition -typedef void* (*CreateInterfaceFn)(const char* pName, int* pReturnCode); - -template <typename T> class SourceInterface -{ -private: - T* m_interface; - -public: - SourceInterface(const std::string& moduleName, const std::string& interfaceName) - { - HMODULE handle = GetModuleHandleA(moduleName.c_str()); - CreateInterfaceFn createInterface = (CreateInterfaceFn)GetProcAddress(handle, "CreateInterface"); - m_interface = (T*)createInterface(interfaceName.c_str(), NULL); - if (m_interface == nullptr) - spdlog::error("Failed to call CreateInterface for %s in %s", interfaceName, moduleName); - } - - T* operator->() const { return m_interface; } - - operator T*() const { return m_interface; } -}; diff --git a/primedev/core/tier1.h b/primedev/core/tier1.h index d162e7c8..36f577cc 100644 --- a/primedev/core/tier1.h +++ b/primedev/core/tier1.h @@ -7,6 +7,12 @@ #define CREATEINTERFACE_PROCNAME "CreateInterface" +enum class InterfaceStatus : int +{ + IFACE_OK = 0, + IFACE_FAILED, +}; + typedef void* (*CreateInterfaceFn)(const char* pName, int* pReturnCode); CMemory Sys_GetFactoryPtr(const std::string& svModuleName, const std::string& svFact); |