core/ChatTriggers.cpp
changeset 2607 f3b8bbe17f85
parent 2603 fa286305bd3f
child 2617 253d6b4f15ab
     1.1 --- a/core/ChatTriggers.cpp	Wed Feb 25 19:22:36 2009 -0500
     1.2 +++ b/core/ChatTriggers.cpp	Wed Feb 25 20:07:12 2009 -0500
     1.3 @@ -63,10 +63,8 @@
     1.4  {
     1.5  	m_PubTrigger = sm_strdup("!");
     1.6  	m_PrivTrigger = sm_strdup("/");
     1.7 -	m_PrivTrigger2 = sm_strdup(".");
     1.8  	m_PubTriggerSize = 1;
     1.9  	m_PrivTriggerSize = 1;
    1.10 -	m_PrivTriggerSize2 = 1;
    1.11  	m_bIsChatTrigger = false;
    1.12  }
    1.13  
    1.14 @@ -76,8 +74,6 @@
    1.15  	m_PubTrigger = NULL;
    1.16  	delete [] m_PrivTrigger;
    1.17  	m_PrivTrigger = NULL;
    1.18 -	delete [] m_PrivTrigger2;
    1.19 -	m_PrivTrigger2 = NULL;
    1.20  }
    1.21  
    1.22  ConfigResult ChatTriggers::OnSourceModConfigChanged(const char *key, 
    1.23 @@ -100,13 +96,6 @@
    1.24  		m_PrivTriggerSize = strlen(m_PrivTrigger);
    1.25  		return ConfigResult_Accept;
    1.26  	}
    1.27 -	else if (strcmp(key, "SilentChatTrigger2") == 0)
    1.28 -	{
    1.29 -		delete [] m_PrivTrigger2;
    1.30 -		m_PrivTrigger2 = sm_strdup(value);
    1.31 -		m_PrivTriggerSize2 = strlen(m_PrivTrigger2);
    1.32 -		return ConfigResult_Accept;
    1.33 -	}
    1.34  	else if (strcmp(key, "SilentFailSuppress") == 0)
    1.35  	{
    1.36  		g_bSupressSilentFails = strcmp(value, "yes") == 0;
    1.37 @@ -263,18 +252,12 @@
    1.38  		is_trigger = true;
    1.39  		args = &args[m_PubTriggerSize];
    1.40  	} 
    1.41 -	else if (m_PrivTriggerSize && strncmp(args, m_PrivTrigger, m_PrivTriggerSize) == 0)
    1.42 +	else if (m_PrivTriggerSize && strncmp(args, m_PrivTrigger, m_PrivTriggerSize) == 0) 
    1.43  	{
    1.44  		is_trigger = true;
    1.45  		is_silent = true;
    1.46  		args = &args[m_PrivTriggerSize];
    1.47  	}
    1.48 -	else if (m_PrivTriggerSize2 && strncmp(args, m_PrivTrigger2, m_PrivTriggerSize2) == 0)
    1.49 -	{
    1.50 -		is_trigger = true;
    1.51 -		is_silent = true;
    1.52 -		args = &args[m_PrivTriggerSize2];
    1.53 -	}
    1.54  
    1.55  	if (!is_trigger)
    1.56  	{