diff -r dfa5ea299c33 -r 5a9efd949f83 sourcehook/sh_memfuncinfo.h --- a/sourcehook/sh_memfuncinfo.h Thu Apr 14 13:15:33 2005 +0000 +++ b/sourcehook/sh_memfuncinfo.h Thu Apr 14 16:17:40 2005 +0000 @@ -137,7 +137,7 @@ { out.vtblindex = MFI_GetVtblOffset(*(void**)&mfp); out.isVirtual = out.vtblindex >= 0 ? true : false; - out.thisptr = reinterpret_cast(&mfp)->delta; + out.thisptroffs = reinterpret_cast(&mfp)->delta; out.vtbloffs = 0; } }; @@ -165,6 +165,7 @@ 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 @@ 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 @@ u2.virtfunc = &GenericVirtualClass::GetThis; u.s.codeptr = u2.s.codeptr; out.thisptroffs = (reinterpret_cast(NULL)->*u.ProbeFunc)(); + */ + out.thisptroffs = -1; out.vtbloffs = 0; } };