clang format, fix issues with server registration and rpak loading

1 files changed, 14 insertions, 19 deletions

diff --git a/NorthstarDLL/sourceinterface.cpp b/NorthstarDLL/sourceinterface.cpp
index 2f1df4ba..157ce614 100644
--- a/NorthstarDLL/sourceinterface.cpp
+++ b/NorthstarDLL/sourceinterface.cpp
@@ -6,8 +6,10 @@ 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*,, (const char* pName, const int* pReturnCode))
+void*, __fastcall, (const char* pName, const int* pReturnCode))
+// clang-format on
 {
 	void* ret = ClientCreateInterface(pName, pReturnCode);
 	spdlog::info("CreateInterface CLIENT {}", pName);
@@ -18,35 +20,28 @@ void*,, (const char* pName, const int* pReturnCode))
 	return ret;
 }
 
+// clang-format off
 AUTOHOOK_PROCADDRESS(ServerCreateInterface, server.dll, CreateInterface, 
-void*,, (const char* pName, const int* pReturnCode))
+void*, __fastcall, (const char* pName, const int* pReturnCode))
+// clang-format on
 {
 	void* ret = ServerCreateInterface(pName, pReturnCode);
-		spdlog::info("CreateInterface SERVER {}", pName);
+	spdlog::info("CreateInterface SERVER {}", pName);
 
 	return ret;
 }
 
+// clang-format off
 AUTOHOOK_PROCADDRESS(EngineCreateInterface, engine.dll, CreateInterface, 
-void*,, (const char* pName, const int* pReturnCode))
+void*, __fastcall, (const char* pName, const int* pReturnCode))
+// clang-format on
 {
 	void* ret = EngineCreateInterface(pName, pReturnCode);
-		spdlog::info("CreateInterface ENGINE {}", pName);
+	spdlog::info("CreateInterface ENGINE {}", pName);
 
 	return ret;
 }
 
-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) 
-}
+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)}