core/ChatTriggers.cpp
changeset 1547 78abc407c8a3
parent 1541 e46ad208b9b4
child 1794 4778536abecc
     1.1 --- a/core/ChatTriggers.cpp	Sun Oct 14 18:44:49 2007 +0000
     1.2 +++ b/core/ChatTriggers.cpp	Sun Oct 14 18:53:29 2007 +0000
     1.3 @@ -35,17 +35,22 @@
     1.4  #include "ConCmdManager.h"
     1.5  #include <IPlayerHelpers.h>
     1.6  
     1.7 -/* :HACKHACK: We can't SH_DECL here because ConCmdManager.cpp does */
     1.8 +/* :HACKHACK: We can't SH_DECL here because ConCmdManager.cpp does.
     1.9 + * While the OB build only runs on MM:S 1.6.0+ (SH 5+), the older one 
    1.10 + * can technically be compiled against any MM:S version after 1.4.2.
    1.11 + */
    1.12  #if defined ORANGEBOX_BUILD
    1.13  extern bool __SourceHook_FHRemoveConCommandDispatch(void *, bool, class fastdelegate::FastDelegate1<const CCommand &, void>);
    1.14  extern int __SourceHook_FHAddConCommandDispatch(void *, ISourceHook::AddHookMode, bool, class fastdelegate::FastDelegate1<const CCommand &, void>);
    1.15  #else
    1.16  extern bool __SourceHook_FHRemoveConCommandDispatch(void *, bool, class fastdelegate::FastDelegate0<void>);
    1.17 -#if SH_IMPL_VERSION >= 4
    1.18 +#if SH_IMPL_VERSION >= 5
    1.19 +extern int __SourceHook_FHAddConCommandDispatch(void *, ISourceHook::AddHookMode, bool, class fastdelegate::FastDelegate0<void>);
    1.20 +#elif SH_IMPL_VERSION == 4
    1.21  extern int __SourceHook_FHAddConCommandDispatch(void *, bool, class fastdelegate::FastDelegate0<void>);
    1.22 -#else
    1.23 +#elif SH_IMPL_VERSION == 3
    1.24  extern bool __SourceHook_FHAddConCommandDispatch(void *, bool, class fastdelegate::FastDelegate0<void>);
    1.25 -#endif //SH_IMPL_VERSION >= 4
    1.26 +#endif //SH_IMPL_VERSION
    1.27  #endif //ORANGEBOX_BUILD
    1.28  
    1.29  ChatTriggers g_ChatTriggers;