rooty/HLMetaModOfficial
1
0
Fork 0
mirror of https://github.com/alliedmodders/metamod-source.git synced 2024-11-28 10:24:20 +01:00
Code Issues Releases Activity

Fixed bugs with multiple and virtual inheritance

Browse Source 
--HG--
extra : convert_revision : svn%3Ac2935e3e-5518-0410-8daf-afa5dab7d4e3/trunk%404
This commit is contained in:
Pavol Marko 2005-04-14 16:17:40 +00:00
parent 20cf4639e5
commit 6b44f98236
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
sourcehook/sh_memfuncinfo.h
View File

@ -137,7 +137,7 @@ namespace SourceHook
{
out.vtblindex = MFI_GetVtblOffset(*(void**)&mfp);
out.isVirtual = out.vtblindex >= 0 ? true : false;
out.thisptr = reinterpret_cast<MSVC_MemFunPtr2*>(&mfp)->delta;
out.thisptroffs = reinterpret_cast<MSVC_MemFunPtr2*>(&mfp)->delta;
out.vtbloffs = 0;
}
};
@ -165,6 +165,7 @@ namespace SourceHook
out.vtblindex = MFI_GetVtblOffset(*(void**)&mfp);
out.isVirtual = out.vtblindex >= 0 ? true : false;
// This pointer
/*
union {
MFP func;
GenericClass* (T::*ProbeFunc)();
@ -176,7 +177,6 @@ namespace SourceHook
MicrosoftVirtualMFP s;
} u2;
printf("%d %d", sizeof(mfp), sizeof(u.ProbeFunc));
// Check that the horrible_cast<>s will work
typedef int ERROR_CantUsehorrible_cast[sizeof(mfp)==sizeof(u.s)
&& sizeof(mfp)==sizeof(u.ProbeFunc)
@ -186,6 +186,8 @@ namespace SourceHook
u2.virtfunc = &GenericVirtualClass::GetThis;
u.s.codeptr = u2.s.codeptr;
out.thisptroffs = (reinterpret_cast<T*>(NULL)->*u.ProbeFunc)();
*/
out.thisptroffs = -1;
out.vtbloffs = 0;
}
};