1.1 --- a/extensions/tf2/extension.cpp	Fri Oct 28 11:24:08 2011 -0400
     1.2 +++ b/extensions/tf2/extension.cpp	Fri Oct 28 19:07:40 2011 -0400
     1.3 @@ -112,7 +112,7 @@
     1.4  	playerhelpers->AddClientListener(this);
     1.5  
     1.6  	g_critForward = forwards->CreateForward("TF2_CalcIsAttackCritical", ET_Hook, 4, NULL, Param_Cell, Param_Cell, Param_String, Param_CellByRef);
     1.7 -	g_getHolidayForward = forwards->CreateForward("TF2_OnGetHoliday", ET_Event, 1, NULL, Param_CellByRef);
     1.8 +	g_isHolidayForward = forwards->CreateForward("TF2_OnIsHolidayActive", ET_Event, 2, NULL, Param_Cell, Param_CellByRef);
     1.9  	g_addCondForward = forwards->CreateForward("TF2_OnConditionAdded", ET_Ignore, 2, NULL, Param_Cell, Param_Cell);
    1.10  	g_removeCondForward = forwards->CreateForward("TF2_OnConditionRemoved", ET_Ignore, 2, NULL, Param_Cell, Param_Cell);
    1.11  	g_waitingPlayersStartForward = forwards->CreateForward("TF2_OnWaitingForPlayersStart", ET_Ignore, 0, NULL);
    1.12 @@ -121,7 +121,7 @@
    1.13  	g_pCVar = icvar;
    1.14  
    1.15  	m_CritDetoursEnabled = false;
    1.16 -	m_GetHolidayDetourEnabled = false;
    1.17 +	m_IsHolidayDetourEnabled = false;
    1.18  	m_CondChecksEnabled = false;
    1.19  	m_RulesDetoursEnabled = false;
    1.20  
    1.21 @@ -168,7 +168,7 @@
    1.22  	plsys->RemovePluginsListener(this);
    1.23  
    1.24  	forwards->ReleaseForward(g_critForward);
    1.25 -	forwards->ReleaseForward(g_getHolidayForward);
    1.26 +	forwards->ReleaseForward(g_isHolidayForward);
    1.27  	forwards->ReleaseForward(g_addCondForward);
    1.28  	forwards->ReleaseForward(g_removeCondForward);
    1.29  	forwards->ReleaseForward(g_waitingPlayersStartForward);
    1.30 @@ -320,9 +320,9 @@
    1.31  		m_CritDetoursEnabled = InitialiseCritDetours();
    1.32  	}
    1.33  
    1.34 -	if (!m_GetHolidayDetourEnabled && g_getHolidayForward->GetFunctionCount())
    1.35 +	if (!m_IsHolidayDetourEnabled && g_isHolidayForward->GetFunctionCount())
    1.36  	{
    1.37 -		m_GetHolidayDetourEnabled = InitialiseGetHolidayDetour();
    1.38 +		m_IsHolidayDetourEnabled = InitialiseIsHolidayDetour();
    1.39  	}
    1.40  
    1.41  	if (!m_CondChecksEnabled
    1.42 @@ -347,10 +347,10 @@
    1.43  		RemoveCritDetours();
    1.44  		m_CritDetoursEnabled = false;
    1.45  	}
    1.46 -	if (m_GetHolidayDetourEnabled && !g_getHolidayForward->GetFunctionCount())
    1.47 +	if (m_IsHolidayDetourEnabled && !g_isHolidayForward->GetFunctionCount())
    1.48  	{
    1.49 -		RemoveGetHolidayDetour();
    1.50 -		m_GetHolidayDetourEnabled = false;
    1.51 +		RemoveIsHolidayDetour();
    1.52 +		m_IsHolidayDetourEnabled = false;
    1.53  	}
    1.54  	if (m_CondChecksEnabled)
    1.55  	{