1.1 --- a/core/ChatTriggers.cpp	Sun Sep 23 21:01:07 2007 +0000
     1.2 +++ b/core/ChatTriggers.cpp	Mon Sep 24 15:06:10 2007 +0000
     1.3 @@ -52,6 +52,7 @@
     1.4  	m_PrivTrigger = sm_strdup("/");
     1.5  	m_PubTriggerSize = 1;
     1.6  	m_PrivTriggerSize = 1;
     1.7 +	m_bIsChatTrigger = false;
     1.8  }
     1.9  
    1.10  ChatTriggers::~ChatTriggers()
    1.11 @@ -141,6 +142,7 @@
    1.12  void ChatTriggers::OnSayCommand_Pre()
    1.13  {
    1.14  	int client = g_ConCmds.GetCommandClient();
    1.15 +	m_bIsChatTrigger = false;
    1.16  
    1.17  	/* The server console cannot do this */
    1.18  	if (client == 0)
    1.19 @@ -190,6 +192,8 @@
    1.20  		RETURN_META(MRES_IGNORED);
    1.21  	}
    1.22  
    1.23 +	m_bIsChatTrigger = true;
    1.24 +
    1.25  	/**
    1.26  	 * We'll execute it in post.
    1.27  	 */
    1.28 @@ -208,6 +212,7 @@
    1.29  
    1.30  void ChatTriggers::OnSayCommand_Post()
    1.31  {
    1.32 +	m_bIsChatTrigger = false;
    1.33  	if (m_bWillProcessInPost)
    1.34  	{
    1.35  		/* Reset this for re-entrancy */
    1.36 @@ -308,3 +313,8 @@
    1.37  {
    1.38  	return m_ReplyTo;
    1.39  }
    1.40 +
    1.41 +bool ChatTriggers::IsChatTrigger()
    1.42 +{
    1.43 +	return m_bIsChatTrigger;
    1.44 +}