1.1 --- a/core/ChatTriggers.cpp	Tue Apr 23 07:11:49 2013 -0400
     1.2 +++ b/core/ChatTriggers.cpp	Tue Apr 23 07:11:49 2013 -0400
     1.3 @@ -37,23 +37,20 @@
     1.4  #include "HalfLife2.h"
     1.5  #include "logic_bridge.h"
     1.6  
     1.7 -/* :HACKHACK: We can't SH_DECL here because ConCmdManager.cpp does.
     1.8 - * While the OB build only runs on MM:S 1.6.0+ (SH 5+), the older one 
     1.9 - * can technically be compiled against any MM:S version after 1.4.2.
    1.10 - */
    1.11 -#if SOURCE_ENGINE >= SE_ORANGEBOX
    1.12 -extern bool __SourceHook_FHRemoveConCommandDispatch(void *, bool, class fastdelegate::FastDelegate1<const CCommand &, void>);
    1.13 -extern int __SourceHook_FHAddConCommandDispatch(void *, ISourceHook::AddHookMode, bool, class fastdelegate::FastDelegate1<const CCommand &, void>);
    1.14 +#if SOURCE_ENGINE == SE_DOTA
    1.15 +SH_DECL_EXTERN2_void(ConCommand, Dispatch, SH_NOATTRIB, false, void *, const CCommand &);
    1.16 +#elif SOURCE_ENGINE >= SE_ORANGEBOX
    1.17 +SH_DECL_EXTERN1_void(ConCommand, Dispatch, SH_NOATTRIB, false, const CCommand &);
    1.18 +#elif SOURCE_ENGINE == SE_DARKMESSIAH
    1.19 +SH_DECL_EXTERN0_void(ConCommand, Dispatch, SH_NOATTRIB, false);
    1.20  #else
    1.21 -extern bool __SourceHook_FHRemoveConCommandDispatch(void *, bool, class fastdelegate::FastDelegate0<void>);
    1.22 -#if SH_IMPL_VERSION >= 5
    1.23 -extern int __SourceHook_FHAddConCommandDispatch(void *, ISourceHook::AddHookMode, bool, class fastdelegate::FastDelegate0<void>);
    1.24 -#elif SH_IMPL_VERSION == 4
    1.25 -extern int __SourceHook_FHAddConCommandDispatch(void *, bool, class fastdelegate::FastDelegate0<void>);
    1.26 -#elif SH_IMPL_VERSION == 3
    1.27 -extern bool __SourceHook_FHAddConCommandDispatch(void *, bool, class fastdelegate::FastDelegate0<void>);
    1.28 -#endif //SH_IMPL_VERSION
    1.29 -#endif //SE_ORANGEBOX
    1.30 +# if SH_IMPL_VERSION >= 4
    1.31 + extern int __SourceHook_FHAddConCommandDispatch(void *,bool,class fastdelegate::FastDelegate0<void>);
    1.32 +# else
    1.33 + extern bool __SourceHook_FHAddConCommandDispatch(void *,bool,class fastdelegate::FastDelegate0<void>);
    1.34 +# endif
    1.35 +extern bool __SourceHook_FHRemoveConCommandDispatch(void *,bool,class fastdelegate::FastDelegate0<void>);
    1.36 +#endif
    1.37  
    1.38  ChatTriggers g_ChatTriggers;
    1.39  bool g_bSupressSilentFails = false;
    1.40 @@ -150,7 +147,10 @@
    1.41  	g_Forwards.ReleaseForward(m_pDidFloodBlock);
    1.42  }
    1.43  
    1.44 -#if SOURCE_ENGINE >= SE_ORANGEBOX
    1.45 +#if SOURCE_ENGINE == SE_DOTA
    1.46 +void ChatTriggers::OnSayCommand_Pre(void *pUnknown, const CCommand &command)
    1.47 +{
    1.48 +#elif SOURCE_ENGINE >= SE_ORANGEBOX
    1.49  void ChatTriggers::OnSayCommand_Pre(const CCommand &command)
    1.50  {
    1.51  #else
    1.52 @@ -267,7 +267,9 @@
    1.53  	RETURN_META(MRES_IGNORED);
    1.54  }
    1.55  
    1.56 -#if SOURCE_ENGINE >= SE_ORANGEBOX
    1.57 +#if SOURCE_ENGINE == SE_DOTA
    1.58 +void ChatTriggers::OnSayCommand_Post(void *pUnknown, const CCommand &command)
    1.59 +#elif SOURCE_ENGINE >= SE_ORANGEBOX
    1.60  void ChatTriggers::OnSayCommand_Post(const CCommand &command)
    1.61  #else
    1.62  void ChatTriggers::OnSayCommand_Post()