Flummi/amxmodx
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #334 from Arkshine/move-dropclient-detour

Browse Source 
Enable detours in ServerActivate to avoid sig conflict with third-party AMXX modules
This commit is contained in:
Vincent Herbet
2016-02-10 19:06:19 +01:00
parent 9d68a5f4cc 98fb03dd30
commit 9fb72a896d
3 changed files with 34 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
amxmodx/meta_api.cpp
View File

@ -619,6 +619,11 @@ void C_ServerActivate(edict_t *pEdictList, int edictCount, int clientMax)
}
}
if (DropClientDetour)
{
DropClientDetour->EnableDetour();
}
RETURN_META(MRES_IGNORED);
}
@ -687,6 +692,11 @@ void C_ServerDeactivate()
}
}
if (DropClientDetour)
{
DropClientDetour->DisableDetour();
}
g_players_num = 0;
executeForwards(FF_PluginEnd);
@ -703,7 +713,7 @@ void C_ServerDeactivate_Post()
RETURN_META(MRES_IGNORED);
modules_callPluginsUnloading();
detachReloadModules();
CoreCfg.Clear();
@ -1581,7 +1591,6 @@ C_DLLEXPORT int Meta_Attach(PLUG_LOADTIME now, META_FUNCTIONS *pFunctionTable, m
if (CommonConfig && CommonConfig->GetMemSig("SV_DropClient", &address) && address)
{
DropClientDetour = DETOUR_CREATE_STATIC_FIXED(SV_DropClient, address);
DropClientDetour->EnableDetour();
}
else
{