Templated SourceHook

.gitmodules

@@ -3,4 +3,4 @@
 	url = https://github.com/alliedmodders/amtl
 [submodule "hl2sdk-manifests"]
 	path = hl2sdk-manifests
-	url = https://github.com/alliedmodders/hl2sdk-manifests
+	url = https://github.com/alliedmodders/hl2sdk-manifests

core/ISmmPlugin.h

@@ -475,12 +475,20 @@ using namespace SourceMM;
 /**
  * @brief This should be in one of your header files, if you wish 
  * to use values like g_SHPtr in other files.
+ * This also creates helpers for accessing the SourceHook templates.
  */
-#define PLUGIN_GLOBALVARS()	\
-	extern SourceHook::ISourceHook *g_SHPtr; \
-	extern ISmmAPI *g_SMAPI; \
-	extern ISmmPlugin *g_PLAPI; \
-	extern PluginId g_PLID; 
+#define PLUGIN_GLOBALVARS()                                                                                      \
+	extern SourceHook::ISourceHook *g_SHPtr;                                                                     \
+	extern ISmmAPI *g_SMAPI;                                                                                     \
+	extern ISmmPlugin *g_PLAPI;                                                                                  \
+	extern PluginId g_PLID;                                                                                      \
+	namespace SourceHook                                                                                         \
+	{                                                                                                            \
+			template <typename Interface, auto Method, typename Result, typename... Args>						 \
+			using Hook = ::SourceHook::HookImpl<&g_SHPtr, &g_PLID, Interface, Method, Result, Args...>;			 \
+			template <typename Interface, auto Method, typename Result, typename... Args>						 \
+			using FmtHook = ::SourceHook::FmtHookImpl<&g_SHPtr, &g_PLID, Interface, Method, Result, Args...>;    \
+	}
 
 /**
  * @brief This should be the first line in your Load callback.

core/metamod_provider.h

@@ -328,6 +328,13 @@ extern PluginId g_PLID;
 extern SourceHook::ISourceHook *g_SHPtr;
 extern SourceMM::IMetamodSourceProvider *provider;
 extern SourceMM::ISmmAPI *g_pMetamod;
+namespace SourceHook                                                                                         
+{                                                                                                            
+	template <typename Interface, auto Method, typename Result, typename... Args>
+	using Hook = ::SourceHook::HookImpl<&g_SHPtr, &g_PLID, Interface, Method, Result, Args...>;
+	template <typename Interface, auto Method, typename Result, typename... Args>
+	using FmtHook = ::SourceHook::FmtHookImpl<&g_SHPtr, &g_PLID, Interface, Method, Result, Args...>;
+}
 
 #endif //_INCLUDE_METAMOD_SOURCE_SUPPORT_H_
 

core/provider/source/provider_source.cpp

@@ -44,14 +44,14 @@ static SourceProvider g_SourceProvider;
 
 IMetamodSourceProvider* provider = &g_SourceProvider;
 
-SH_DECL_HOOK0(IServerGameDLL, GameInit, SH_NOATTRIB, 0, bool);
-SH_DECL_HOOK6(IServerGameDLL, LevelInit, SH_NOATTRIB, 0, bool, const char*, const char*, const char*, const char*, bool, bool);
-SH_DECL_HOOK0_void(IServerGameDLL, LevelShutdown, SH_NOATTRIB, 0);
+auto OnGameInit = SourceHook::Hook<IServerGameDLL, &IServerGameDLL::GameInit, bool>::Make();
+auto OnLevelInit = SourceHook::Hook<IServerGameDLL, &IServerGameDLL::LevelInit, bool, const char*, const char*, const char*, const char*, bool, bool>::Make();
+auto OnLevelShutdown = SourceHook::Hook<IServerGameDLL, &IServerGameDLL::LevelShutdown, void>::Make();
 
 #if SOURCE_ENGINE >= SE_ORANGEBOX
-SH_DECL_HOOK2_void(IServerGameClients, ClientCommand, SH_NOATTRIB, 0, edict_t*, const CCommand&);
+auto OnClientCommand = SourceHook::Hook<IServerGameClients, &IServerGameClients::ClientCommand, void, edict_t*, const CCommand&>::Make();
 #else
-SH_DECL_HOOK1_void(IServerGameClients, ClientCommand, SH_NOATTRIB, 0, edict_t*);
+auto OnClientCommand = SourceHook::Hook<IServerGameClients, &IServerGameClients::ClientCommand, void, edict_t*>::Make();
 #endif
 
 void SourceProvider::Notify_DLLInit_Pre(CreateInterfaceFn engineFactory,
@@ -69,34 +69,30 @@ void SourceProvider::Notify_DLLInit_Pre(CreateInterfaceFn engineFactory,
 		}
 	}
 #else
-	engine = (IVEngineServer*)((engineFactory)(INTERFACEVERSION_VENGINESERVER, NULL));
+	engine = (IVEngineServer *) ((engineFactory)(INTERFACEVERSION_VENGINESERVER, NULL));
 #endif
-	if (!engine)
-	{
+	if (!engine) {
 		DisplayError("Could not find IVEngineServer! Metamod cannot load.");
 		return;
 	}
 
 #if SOURCE_ENGINE >= SE_ORANGEBOX
-	icvar = (ICvar*)((engineFactory)(CVAR_INTERFACE_VERSION, NULL));
+	icvar = (ICvar *) ((engineFactory)(CVAR_INTERFACE_VERSION, NULL));
 #else
 	icvar = (ICvar*)((engineFactory)(VENGINE_CVAR_INTERFACE_VERSION, NULL));
 #endif
-	if (!icvar)
-	{
+	if (!icvar) {
 		DisplayError("Could not find ICvar! Metamod cannot load.");
 		return;
 	}
 
-	if ((gameclients = (IServerGameClients*)(serverFactory("ServerGameClients003", NULL)))
-		== NULL)
-	{
-		gameclients = (IServerGameClients*)(serverFactory("ServerGameClients004", NULL));
+	if ((gameclients = (IServerGameClients *) (serverFactory("ServerGameClients003", NULL)))
+		== NULL) {
+		gameclients = (IServerGameClients *) (serverFactory("ServerGameClients004", NULL));
 	}
 
-	baseFs = (IFileSystem*)((engineFactory)(FILESYSTEM_INTERFACE_VERSION, NULL));
-	if (baseFs == NULL)
-	{
+	baseFs = (IFileSystem *) ((engineFactory)(FILESYSTEM_INTERFACE_VERSION, NULL));
+	if (baseFs == NULL) {
 		mm_LogMessage("Unable to find \"%s\": .vdf files will not be parsed", FILESYSTEM_INTERFACE_VERSION);
 	}
 
@@ -122,21 +118,20 @@ void SourceProvider::Notify_DLLInit_Pre(CreateInterfaceFn engineFactory,
 	}
 #endif
 
-	if (gameclients)
-	{
-		SH_ADD_HOOK(IServerGameClients, ClientCommand, gameclients, SH_MEMBER(this, &SourceProvider::Hook_ClientCommand), false);
+	if (gameclients) {
+		OnClientCommand->Add(gameclients, false, SH_MEMBER(this, &SourceProvider::Hook_ClientCommand));
 	}
 
-	SH_ADD_HOOK(IServerGameDLL, GameInit, server, SH_MEMBER(this, &SourceProvider::Hook_GameInit), false);
-	SH_ADD_HOOK(IServerGameDLL, LevelInit, server, SH_MEMBER(this, &SourceProvider::Hook_LevelInit), true);
-	SH_ADD_HOOK(IServerGameDLL, LevelShutdown, server, SH_MEMBER(this, &SourceProvider::Hook_LevelShutdown), true);
+	OnGameInit->Add(server, false, SH_MEMBER(this, &SourceProvider::Hook_GameInit));
+	OnLevelInit->Add(server, true, SH_MEMBER(this, &SourceProvider::Hook_LevelInit));
+	OnLevelShutdown->Add(server, true, SH_MEMBER(this, &SourceProvider::Hook_LevelShutdown));
 }
 
 void SourceProvider::Notify_DLLShutdown_Pre()
 {
-	SH_REMOVE_HOOK(IServerGameDLL, GameInit, server, SH_MEMBER(this, &SourceProvider::Hook_GameInit), false);
-	SH_REMOVE_HOOK(IServerGameDLL, LevelInit, server, SH_MEMBER(this, &SourceProvider::Hook_LevelInit), true);
-	SH_REMOVE_HOOK(IServerGameDLL, LevelShutdown, server, SH_MEMBER(this, &SourceProvider::Hook_LevelShutdown), true);
+	OnGameInit->Remove(server, false, SH_MEMBER(this, &SourceProvider::Hook_GameInit));
+	OnLevelInit->Remove(server, true, SH_MEMBER(this, &SourceProvider::Hook_LevelInit));
+	OnLevelShutdown->Remove(server, true, SH_MEMBER(this, &SourceProvider::Hook_LevelShutdown));
 
 	m_ConVarAccessor.RemoveMetamodCommands();