Fix console not enabling (#379)

6 files changed, 84 insertions, 4 deletions

diff --git a/NorthstarDLL/core/convar/convar.cpp b/NorthstarDLL/core/convar/convar.cpp
index eaa988dc..5ff0e4c1 100644
--- a/NorthstarDLL/core/convar/convar.cpp
+++ b/NorthstarDLL/core/convar/convar.cpp
@@ -2,7 +2,7 @@
 #include "bits.h"
 #include "cvar.h"
 #include "convar.h"
-#include "shared/sourceinterface.h"
+#include "core/sourceinterface.h"
 
 #include <float.h>
 
diff --git a/NorthstarDLL/core/convar/convar.h b/NorthstarDLL/core/convar/convar.h
index 86ec64e6..edc6ac97 100644
--- a/NorthstarDLL/core/convar/convar.h
+++ b/NorthstarDLL/core/convar/convar.h
@@ -1,5 +1,5 @@
 #pragma once
-#include "shared/sourceinterface.h"
+#include "core/sourceinterface.h"
 #include "core/math/color.h"
 #include "cvar.h"
 #include "concommand.h"
diff --git a/NorthstarDLL/core/filesystem/filesystem.cpp b/NorthstarDLL/core/filesystem/filesystem.cpp
index 230c9161..ac42d00f 100644
--- a/NorthstarDLL/core/filesystem/filesystem.cpp
+++ b/NorthstarDLL/core/filesystem/filesystem.cpp
@@ -1,6 +1,6 @@
 #include "pch.h"
 #include "filesystem.h"
-#include "shared/sourceinterface.h"
+#include "core/sourceinterface.h"
 #include "mods/modmanager.h"
 
 #include <iostream>
diff --git a/NorthstarDLL/core/filesystem/filesystem.h b/NorthstarDLL/core/filesystem/filesystem.h
index 8739d342..560b8c2c 100644
--- a/NorthstarDLL/core/filesystem/filesystem.h
+++ b/NorthstarDLL/core/filesystem/filesystem.h
@@ -1,5 +1,5 @@
 #pragma once
-#include "shared/sourceinterface.h"
+#include "core/sourceinterface.h"
 
 // taken from ttf2sdk
 typedef void* FileHandle_t;
diff --git a/NorthstarDLL/core/sourceinterface.cpp b/NorthstarDLL/core/sourceinterface.cpp
new file mode 100644
index 00000000..f9ad694c
--- /dev/null
+++ b/NorthstarDLL/core/sourceinterface.cpp
@@ -0,0 +1,49 @@
+#include "pch.h"
+#include "sourceinterface.h"
+#include "logging/sourceconsole.h"
+
+AUTOHOOK_INIT()
+
+// really wanted to do a modular callback system here but honestly couldn't be bothered so hardcoding stuff for now: todo later
+
+// clang-format off
+AUTOHOOK_PROCADDRESS(ClientCreateInterface, client.dll, CreateInterface, 
+void*, __fastcall, (const char* pName, const int* pReturnCode))
+// clang-format on
+{
+	void* ret = ClientCreateInterface(pName, pReturnCode);
+	spdlog::info("CreateInterface CLIENT {}", pName);
+
+	if (!strcmp(pName, "GameClientExports001"))
+		InitialiseConsoleOnInterfaceCreation();
+
+	return ret;
+}
+
+// clang-format off
+AUTOHOOK_PROCADDRESS(ServerCreateInterface, server.dll, CreateInterface, 
+void*, __fastcall, (const char* pName, const int* pReturnCode))
+// clang-format on
+{
+	void* ret = ServerCreateInterface(pName, pReturnCode);
+	spdlog::info("CreateInterface SERVER {}", pName);
+
+	return ret;
+}
+
+// clang-format off
+AUTOHOOK_PROCADDRESS(EngineCreateInterface, engine.dll, CreateInterface, 
+void*, __fastcall, (const char* pName, const int* pReturnCode))
+// clang-format on
+{
+	void* ret = EngineCreateInterface(pName, pReturnCode);
+	spdlog::info("CreateInterface ENGINE {}", pName);
+
+	return ret;
+}
+
+// clang-format off
+ON_DLL_LOAD("client.dll", ClientInterface, (CModule module)) {AUTOHOOK_DISPATCH_MODULE(client.dll)}
+ON_DLL_LOAD("server.dll", ServerInterface, (CModule module)) {AUTOHOOK_DISPATCH_MODULE(server.dll)}
+ON_DLL_LOAD("engine.dll", EngineInterface, (CModule module)) {AUTOHOOK_DISPATCH_MODULE(engine.dll)}
+// clang-format on
diff --git a/NorthstarDLL/core/sourceinterface.h b/NorthstarDLL/core/sourceinterface.h
new file mode 100644
index 00000000..474e961b
--- /dev/null
+++ b/NorthstarDLL/core/sourceinterface.h
@@ -0,0 +1,31 @@
+#pragma once
+#include <string>
+
+// 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;
+	}
+};