UNLOZE/sourcemod
10
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

fixed amb582 - private triggers getting fired twice

Browse Source 
--HG--
extra : convert_revision : svn%3A39bc706e-5318-0410-9160-8a85361fbb7c/trunk%401109
This commit is contained in:
David Anderson 2007-07-14 00:35:08 +00:00
parent b07a13fab0
commit f2194aa2d9
2 changed files with 31 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

61
core/ChatTriggers.cpp
View File

@ -15,7 +15,7 @@ extern bool __SourceHook_FHAddConCommandDispatch(void *, bool, class fastdelegat
ChatTriggers g_ChatTriggers; ChatTriggers g_ChatTriggers;
ChatTriggers::ChatTriggers() : m_pSayCmd(NULL), m_bWillProcessInPost(false), ChatTriggers::ChatTriggers() : m_pSayCmd(NULL), m_bWillProcessInPost(false),
m_ReplyTo(SM_REPLY_CONSOLE) m_bTriggerWasSilent(false), m_ReplyTo(SM_REPLY_CONSOLE)
{ {
m_PubTrigger = sm_strdup("!"); m_PubTrigger = sm_strdup("!");
m_PrivTrigger = sm_strdup("/"); m_PrivTrigger = sm_strdup("/");
@ -134,9 +134,11 @@ void ChatTriggers::OnSayCommand_Pre()
if (m_PubTriggerSize && strncmp(args, m_PubTrigger, m_PubTriggerSize) == 0) if (m_PubTriggerSize && strncmp(args, m_PubTrigger, m_PubTriggerSize) == 0)
{ {
is_trigger = true; is_trigger = true;
args = &args[m_PubTriggerSize];
} else if (m_PrivTriggerSize && strncmp(args, m_PrivTrigger, m_PrivTriggerSize) == 0) { } else if (m_PrivTriggerSize && strncmp(args, m_PrivTrigger, m_PrivTriggerSize) == 0) {
is_trigger = true; is_trigger = true;
is_silent = true; is_silent = true;
args = &args[m_PrivTriggerSize];
} }
if (!is_trigger) if (!is_trigger)
@ -144,21 +146,27 @@ void ChatTriggers::OnSayCommand_Pre()
RETURN_META(MRES_IGNORED); RETURN_META(MRES_IGNORED);
} }
/* If we're a public command, process later */ /**
if (!is_silent) * Test if this is actually a command!
*/
if (!PreProcessTrigger(engine->PEntityOfEntIndex(client), args, is_quoted))
{ {
/* We have to process this in _post_ instead. Darn. */
m_bWillProcessInPost = true;
RETURN_META(MRES_IGNORED); RETURN_META(MRES_IGNORED);
} }
/* Otherwise, process now */ /**
if (ProcessTrigger(engine->PEntityOfEntIndex(client), &args[m_PrivTriggerSize], is_quoted)) * We'll execute it in post.
*/
m_bWillProcessInPost = true;
m_bTriggerWasSilent = is_silent;
/* If we're silent, block */
if (is_silent)
{ {
/* If we succeed, block the original say! */
RETURN_META(MRES_SUPERCEDE); RETURN_META(MRES_SUPERCEDE);
} }
/* Otherwise, let the command continue */
RETURN_META(MRES_IGNORED); RETURN_META(MRES_IGNORED);
} }
@ -169,24 +177,15 @@ void ChatTriggers::OnSayCommand_Post()
/* Reset this for re-entrancy */ /* Reset this for re-entrancy */
m_bWillProcessInPost = false; m_bWillProcessInPost = false;
/* Get our arguments */ /* Execute the cached command */
const char *args = engine->Cmd_Args();
/* Handle quotations */
bool is_quoted = false;
if (args[0] == '"')
{
args++;
is_quoted = true;
}
int client = g_ConCmds.GetCommandClient(); int client = g_ConCmds.GetCommandClient();
unsigned int old = SetReplyTo(SM_REPLY_CHAT);
ProcessTrigger(engine->PEntityOfEntIndex(client), &args[m_PubTriggerSize], is_quoted); serverpluginhelpers->ClientCommand(engine->PEntityOfEntIndex(client), m_ToExecute);
SetReplyTo(old);
} }
} }
bool ChatTriggers::ProcessTrigger(edict_t *pEdict, const char *args, bool is_quoted) bool ChatTriggers::PreProcessTrigger(edict_t *pEdict, const char *args, bool is_quoted)
{ {
/* Eat up whitespace */ /* Eat up whitespace */
while (*args != '\0' && IsWhitespace(args)) while (*args != '\0' && IsWhitespace(args))
@ -242,34 +241,28 @@ bool ChatTriggers::ProcessTrigger(edict_t *pEdict, const char *args, bool is_quo
/* See if we need to do extra string manipulation */ /* See if we need to do extra string manipulation */
if (is_quoted || prepended) if (is_quoted || prepended)
{ {
static char buffer[300];
size_t len; size_t len;
/* Check if we need to prepend sm_ */ /* Check if we need to prepend sm_ */
if (prepended) if (prepended)
{ {
len = UTIL_Format(buffer, sizeof(buffer), "sm_%s", args); len = UTIL_Format(m_ToExecute, sizeof(m_ToExecute), "sm_%s", args);
} else { } else {
len = strncopy(buffer, args, sizeof(buffer)); len = strncopy(m_ToExecute, args, sizeof(m_ToExecute));
} }
/* Check if we need to strip a quote */ /* Check if we need to strip a quote */
if (is_quoted) if (is_quoted)
{ {
if (buffer[len-1] == '"') if (m_ToExecute[len-1] == '"')
{ {
buffer[--len] = '\0'; m_ToExecute[--len] = '\0';
} }
} }
} else {
args = buffer; strncopy(m_ToExecute, args, sizeof(m_ToExecute));
} }
/* Finally, execute! */
unsigned int old = SetReplyTo(SM_REPLY_CHAT);
serverpluginhelpers->ClientCommand(pEdict, args);
SetReplyTo(old);
return true; return true;
} }

4
core/ChatTriggers.h
View File

@ -27,7 +27,7 @@ public:
unsigned int GetReplyTo(); unsigned int GetReplyTo();
unsigned int SetReplyTo(unsigned int reply); unsigned int SetReplyTo(unsigned int reply);
private: private:
bool ProcessTrigger(edict_t *pEdict, const char *args, bool is_quoted); bool PreProcessTrigger(edict_t *pEdict, const char *args, bool is_quoted);
private: private:
ConCommand *m_pSayCmd; ConCommand *m_pSayCmd;
ConCommand *m_pSayTeamCmd; ConCommand *m_pSayTeamCmd;
@ -36,7 +36,9 @@ private:
char *m_PrivTrigger; char *m_PrivTrigger;
size_t m_PrivTriggerSize; size_t m_PrivTriggerSize;
bool m_bWillProcessInPost; bool m_bWillProcessInPost;
bool m_bTriggerWasSilent;
unsigned int m_ReplyTo; unsigned int m_ReplyTo;
char m_ToExecute[300];
}; };
extern ChatTriggers g_ChatTriggers; extern ChatTriggers g_ChatTriggers;