Adapt code to latest khook changes

Author: Kenzzer

extensions/sdkhooks/extension.cpp

@@ -1017,7 +1017,7 @@ KHook::Return<bool> SDKHooks::Hook_CanBeAutobalanced(CBaseEntity* this_ptr)
 
 		int entity = gamehelpers->EntityToBCompatRef(pPlayer);
 
-		auto mfp = KHook::BuildMFP<CBaseEntity, bool>(KHook::FindOriginalVirtual(*(void***)this_ptr, g_HookTypes[SDKHook_CanBeAutobalanced].offset));
+		auto mfp = KHook::BuildMFP<bool (CBaseEntity::*)()>(KHook::FindOriginalVirtual(*(void***)this_ptr, g_HookTypes[SDKHook_CanBeAutobalanced].offset));
 		bool origRet = (this_ptr->*mfp)();
 		bool newRet = origRet;
 
@@ -1107,7 +1107,7 @@ KHook::Return<void> SDKHooks::Hook_FireBulletsPost(CBaseEntity* this_ptr, const
 KHook::Return<int> SDKHooks::Hook_GetMaxHealth(CBaseEntity* this_ptr)
 {
 	CBaseEntity *pEntity = this_ptr;
-	auto mfp = KHook::BuildMFP<CBaseEntity, int>(KHook::FindOriginalVirtual(*(void***)pEntity, g_HookTypes[SDKHook_GetMaxHealth].offset));
+	auto mfp = KHook::BuildMFP<int (CBaseEntity::*)()>(KHook::FindOriginalVirtual(*(void***)pEntity, g_HookTypes[SDKHook_GetMaxHealth].offset));
 	int original_max = (pEntity->*mfp)();
 
 	void** vtable = *(void***)this_ptr;

extensions/sdkhooks/natives.cpp

@@ -178,7 +178,7 @@ cell_t Native_TakeDamage(IPluginContext *pContext, const cell_t *params)
 	if (params[0] < 9 || params[9] != 0)
 	{
 		auto func = KHook::FindOriginalVirtual(*(void***)pVictim, g_HookTypes[SDKHook_OnTakeDamage].offset);
-		auto mfp = KHook::BuildMFP<CBaseEntity, int, const CTakeDamageInfoHack&>(func);
+		auto mfp = KHook::BuildMFP<int (CBaseEntity::*)(const CTakeDamageInfoHack&)>(func);
 		(pVictim->*mfp)(info);
 	}
 	else
@@ -292,7 +292,7 @@ cell_t Native_DropWeapon(IPluginContext *pContext, const cell_t *params)
 	if (params[0] < 5 || params[5] != 0)
 	{
 		auto func = KHook::FindOriginalVirtual(*(void***)pPlayer, g_HookTypes[SDKHook_WeaponDrop].offset);
-		auto mfp = KHook::BuildMFP<CBaseEntity, void, CBaseCombatWeapon*, const Vector*, const Vector*>(func);
+		auto mfp = KHook::BuildMFP<void (CBaseEntity::*)(CBaseCombatWeapon*, const Vector*, const Vector*)>(func);
 		(pPlayer->*mfp)((CBaseCombatWeapon*)pWeapon, pVecTarget, pVecVelocity);
 	}
 	else

extensions/sdktools/outputnatives.cpp

@@ -156,13 +156,8 @@ cell_t HookEntityOutput(IPluginContext *pContext, const cell_t *params)
 
 	g_OutputManager.OnHookAdded();
 
-<<<<<<< HEAD
 	IPlugin *pPlugin = plsys->FindPluginByContext(pContext);
-	SourceHook::List<omg_hooks *> *pList = NULL;
-=======
-	IPlugin *pPlugin = plsys->FindPluginByContext(pContext->GetContext());
 	std::list<omg_hooks *> *pList = NULL;
->>>>>>> d3e1c5363 (Strip sourcehook from SDKTools Part 1)
 
 	if (!pPlugin->GetProperty("OutputHookList", (void **)&pList, false) || !pList)
 	{

extensions/tf2/gameplayrules.cpp

@@ -73,7 +73,7 @@ bool InitialiseRulesDetours()
 		g_pSM->LogError(myself, "Failed to retrieve SetInWaitingForPlayers.");
 		return false;
 	}
-	g_HookSetInWaitingForPlayers.Configure(KHook::BuildMFP<CTeamplayRoundBasedRules, void, bool>(addr));
+	g_HookSetInWaitingForPlayers.Configure(KHook::BuildMFP<void (CTeamplayRoundBasedRules::*)(bool)>(addr));
 	return true;
 }