From 3d11742f91e6d72cbaa1bc0b79cb74e8214066e3 Mon Sep 17 00:00:00 2001 From: Nicholas Hastings Date: Fri, 23 Aug 2013 18:48:06 -0400 Subject: [PATCH] Add missing GetFunctionCount check in ChatTriggers::OnSayCommand_Pre (bug 5864, r=kyles). --- core/ChatTriggers.cpp | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/core/ChatTriggers.cpp b/core/ChatTriggers.cpp index 7142d40b..f911d42b 100644 --- a/core/ChatTriggers.cpp +++ b/core/ChatTriggers.cpp @@ -304,15 +304,12 @@ void ChatTriggers::OnSayCommand_Pre() m_bTriggerWasSilent = is_silent; } - if (m_pOnClientSayCmd->GetFunctionCount() != 0) - { - cell_t res = CallOnClientSayCommand(client); + cell_t res = CallOnClientSayCommand(client); - if (res >= Pl_Handled) - { - m_bPluginIgnored = (res >= Pl_Stop); - RETURN_META(MRES_SUPERCEDE); - } + if (res >= Pl_Handled) + { + m_bPluginIgnored = (res >= Pl_Stop); + RETURN_META(MRES_SUPERCEDE); } if (m_bWillProcessInPost || \ @@ -437,10 +434,13 @@ bool ChatTriggers::PreProcessTrigger(edict_t *pEdict, const char *args, bool is_ cell_t ChatTriggers::CallOnClientSayCommand(int client) { cell_t res = Pl_Continue; - m_pOnClientSayCmd->PushCell(client); - m_pOnClientSayCmd->PushString(m_Arg0Backup); - m_pOnClientSayCmd->PushString(m_ArgSBackup); - m_pOnClientSayCmd->Execute(&res); + if (m_pOnClientSayCmd->GetFunctionCount() != 0) + { + m_pOnClientSayCmd->PushCell(client); + m_pOnClientSayCmd->PushString(m_Arg0Backup); + m_pOnClientSayCmd->PushString(m_ArgSBackup); + m_pOnClientSayCmd->Execute(&res); + } return res; }