1.1 --- a/sourcehook/sourcehook.h Fri Oct 14 21:09:12 2005 +0000
1.2 +++ b/sourcehook/sourcehook.h Sat Oct 15 17:55:31 2005 +0000
1.3 @@ -25,10 +25,13 @@
1.4 #define SH_IFACE_VERSION 4
1.5 #define SH_IMPL_VERSION 3
1.6
1.7 +// The value of SH_GLOB_SHPTR has to be a pointer to SourceHook::ISourceHook
1.8 +// It's used in various macros
1.9 #ifndef SH_GLOB_SHPTR
1.10 #define SH_GLOB_SHPTR g_SHPtr
1.11 #endif
1.12
1.13 +// Used to identify the current plugin
1.14 #ifndef SH_GLOB_PLUGPTR
1.15 #define SH_GLOB_PLUGPTR g_PLID
1.16 #endif
1.17 @@ -447,7 +450,7 @@
1.18 if (SH_GLOB_SHPTR->GetIfaceVersion() != SH_IFACE_VERSION) \
1.19 return 1; \
1.20 \
1.21 - if (action == ::SourceHook::HA_GetInfo) \
1.22 + if (action == HA_GetInfo) \
1.23 { \
1.24 param->SetInfo(ms_MFI.vtbloffs, ms_MFI.vtblindex, ms_Proto); \
1.25 \
1.26 @@ -457,12 +460,12 @@
1.27 reinterpret_cast<void**>(reinterpret_cast<char*>(&ms_Inst) + mfi.vtbloffs)[mfi.vtblindex]); \
1.28 return 0; \
1.29 } \
1.30 - else if (action == ::SourceHook::HA_Register) \
1.31 + else if (action == HA_Register) \
1.32 { \
1.33 ms_HI = param; \
1.34 return 0; \
1.35 } \
1.36 - else if (action == ::SourceHook::HA_Unregister) \
1.37 + else if (action == HA_Unregister) \
1.38 { \
1.39 ms_HI = NULL; \
1.40 return 0; \
1.41 @@ -1767,8 +1770,6 @@
1.42
1.43 #if SH_COMP == SH_COMP_MSVC
1.44
1.45 -// :TODO: TEST THIS ON MSVC
1.46 -
1.47 # define SH_MAKE_EXECUTABLECLASS_OB(call, prms) \
1.48 { \
1.49 using namespace ::SourceHook; \