From 8a29c5bbd05cf52007a8aa3ff833c8fed237a625 Mon Sep 17 00:00:00 2001
From: F1F7Y <64418963+F1F7Y@users.noreply.github.com>
Date: Sun, 6 Oct 2024 09:59:22 +0200
Subject: core: Remove unused SourceInterface class (#816)

Removes unused `SourceInterface` class, moves `InterfaceStatus` enum to `tier1.h`.
---
 primedev/Northstar.cmake                  |  1 -
 primedev/core/convar/convar.h             |  1 -
 primedev/core/sourceinterface.cpp         |  1 -
 primedev/core/sourceinterface.h           | 32 -------------------------------
 primedev/core/tier1.h                     |  6 ++++++
 primedev/logging/sourceconsole.h          |  1 -
 primedev/plugins/interfaces/interface.cpp |  1 +
 primedev/plugins/interfaces/sys/ISys.cpp  |  1 +
 primedev/plugins/plugins.cpp              |  1 -
 primedev/plugins/plugins.h                |  2 +-
 10 files changed, 9 insertions(+), 38 deletions(-)
 delete mode 100644 primedev/core/sourceinterface.h

(limited to 'primedev')

diff --git a/primedev/Northstar.cmake b/primedev/Northstar.cmake
index 4e8ec973..35383e69 100644
--- a/primedev/Northstar.cmake
+++ b/primedev/Northstar.cmake
@@ -52,7 +52,6 @@ add_library(
     "core/memalloc.cpp"
     "core/memalloc.h"
     "core/sourceinterface.cpp"
-    "core/sourceinterface.h"
     "core/tier0.cpp"
     "core/tier0.h"
     "core/tier1.cpp"
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);
diff --git a/primedev/logging/sourceconsole.h b/primedev/logging/sourceconsole.h
index 35cc1723..8c647fb4 100644
--- a/primedev/logging/sourceconsole.h
+++ b/primedev/logging/sourceconsole.h
@@ -1,5 +1,4 @@
 #pragma once
-#include "core/sourceinterface.h"
 #include "spdlog/sinks/base_sink.h"
 #include <map>
 
diff --git a/primedev/plugins/interfaces/interface.cpp b/primedev/plugins/interfaces/interface.cpp
index bc900542..e8200560 100644
--- a/primedev/plugins/interfaces/interface.cpp
+++ b/primedev/plugins/interfaces/interface.cpp
@@ -1,4 +1,5 @@
 #include <string.h>
+#include "core/tier1.h"
 #include "interface.h"
 
 InterfaceReg* s_pInterfaceRegs;
diff --git a/primedev/plugins/interfaces/sys/ISys.cpp b/primedev/plugins/interfaces/sys/ISys.cpp
index 6b0b41dd..948e7d90 100644
--- a/primedev/plugins/interfaces/sys/ISys.cpp
+++ b/primedev/plugins/interfaces/sys/ISys.cpp
@@ -1,3 +1,4 @@
+#include "core/tier1.h"
 #include "plugins/interfaces/interface.h"
 #include "ISys.h"
 #include "plugins/plugins.h"
diff --git a/primedev/plugins/plugins.cpp b/primedev/plugins/plugins.cpp
index 92be9d5c..21169c06 100644
--- a/primedev/plugins/plugins.cpp
+++ b/primedev/plugins/plugins.cpp
@@ -2,7 +2,6 @@
 #include "pluginmanager.h"
 #include "squirrel/squirrel.h"
 #include "util/wininfo.h"
-#include "core/sourceinterface.h"
 #include "logging/logging.h"
 #include "dedicated/dedicated.h"
 
diff --git a/primedev/plugins/plugins.h b/primedev/plugins/plugins.h
index d004038c..71e184c7 100644
--- a/primedev/plugins/plugins.h
+++ b/primedev/plugins/plugins.h
@@ -1,5 +1,5 @@
 #pragma once
-#include "core/sourceinterface.h"
+#include "core/tier1.h"
 #include "plugins/interfaces/interface.h"
 #include "plugins/interfaces/IPluginId.h"
 #include "plugins/interfaces/IPluginCallbacks.h"
-- 
cgit v1.2.3