rooty/HLMetaModOfficial
1
0
Fork 0
mirror of https://github.com/alliedmodders/metamod-source.git synced 2025-02-20 13:54:14 +01:00
Code Issues Releases Activity

Fixed crash regression on old engines (ep1, darkm) caused by previous changeset (bug 4529, r=dvander).

Browse Source
This commit is contained in:
Scott Ehlert 2010-07-27 04:26:14 -05:00
parent 0ada46b1e9
commit 6b9bd44ff1
1 changed files with 34 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

58
loader/serverplugin.cpp
View File

@ -101,11 +101,14 @@ public:
mm_LogFatal("Could not detect engine version");
return false;
}
else if (mm_backend >= MMBackend_Episode2)
void **this_vtable;
this_vtable = (void **)*(void **)this;
if (mm_backend >= MMBackend_Episode2)
{
/* We need to insert the right type of call into this vtable */
void **vtable_src;
void **vtable_dest;
IRandomThings sample;
SourceHook::MemFuncInfo mfp_dest, mfp_src;
@ -123,32 +126,37 @@ public:
assert(mfp_src.vtbloffs == 0);
vtable_src = (void **)*(void **)&sample;
vtable_dest = (void **)*(void **)this;
SourceHook::SetMemAccess(&vtable_dest[mfp_dest.vtblindex],
SourceHook::SetMemAccess(&this_vtable[mfp_dest.vtblindex],
sizeof(void*),
SH_MEM_READ|SH_MEM_WRITE|SH_MEM_EXEC);
vtable_dest[mfp_dest.vtblindex] = vtable_src[mfp_src.vtblindex];
/* AS engine inserted ClientFullyConnect into the vtable, so move entries up on older engines */
if (mm_backend != MMBackend_AlienSwarm)
{
SourceHook::MemFuncInfo mfp_fconnect;
mfp_fconnect.isVirtual = false;
SourceHook::GetFuncInfo(&ServerPlugin::ClientFullyConnect, mfp_fconnect);
assert(mfp_fconnect.isVirtual);
assert(mfp_fconnect.thisptroffs == 0);
assert(mfp_fconnect.vtbloffs == 0);
/* Shifting ClientDisconnect through OnQueryCvarValueFinished up into slot for ClientFullyConnect (8 entries) */
SourceHook::SetMemAccess(&vtable_dest[mfp_fconnect.vtblindex],
sizeof(void *) * 8,
SH_MEM_READ|SH_MEM_WRITE|SH_MEM_EXEC);
memmove(&vtable_dest[mfp_fconnect.vtblindex], &vtable_dest[mfp_fconnect.vtblindex + 1], sizeof(void *) * 8);
}
this_vtable[mfp_dest.vtblindex] = vtable_src[mfp_src.vtblindex];
}
#ifdef _WIN32
/* AS inserted ClientFullyConnect into vtable, so move entries up on older engines */
if (mm_backend != MMBackend_AlienSwarm)
{
SourceHook::MemFuncInfo mfp_fconnect;
mfp_fconnect.isVirtual = false;
SourceHook::GetFuncInfo(&ServerPlugin::ClientFullyConnect, mfp_fconnect);
assert(mfp_fconnect.isVirtual);
assert(mfp_fconnect.thisptroffs == 0);
assert(mfp_fconnect.vtbloffs == 0);
/* Shifting ClientDisconnect through OnQueryCvarValueFinished up into slot for
* ClientFullyConnect (8 entries)
*/
SourceHook::SetMemAccess(&this_vtable[mfp_fconnect.vtblindex],
sizeof(void *) * 8,
SH_MEM_READ|SH_MEM_WRITE|SH_MEM_EXEC);
memmove(&this_vtable[mfp_fconnect.vtblindex],
&this_vtable[mfp_fconnect.vtblindex + 1],
sizeof(void *) * 8);
}
#endif
char error[255];
if (gamedll_bridge == NULL)
{
@ -232,9 +240,11 @@ public:
virtual void ClientActive(edict_t *pEntity)
{
}
#ifdef _WIN32
virtual void ClientFullyConnect(edict_t *pEntity)
{
}
#endif
virtual void ClientDisconnect(edict_t *pEntity)
{
}