1.1 --- a/core/TimerSys.cpp	Sat Nov 24 18:17:00 2007 +0000
     1.2 +++ b/core/TimerSys.cpp	Sun Nov 25 02:45:12 2007 +0000
     1.3 @@ -224,11 +224,6 @@
     1.4  	g_Forwards.ReleaseForward(m_pOnMapTimeLeftChanged);
     1.5  }
     1.6  
     1.7 -void TimerSystem::OnSourceModLevelChange(const char *mapName)
     1.8 -{
     1.9 -	MapChange(true);
    1.10 -}
    1.11 -
    1.12  void TimerSystem::OnSourceModLevelEnd()
    1.13  {
    1.14  	m_bHasMapTickedYet = false;
    1.15 @@ -423,7 +418,7 @@
    1.16  }
    1.17  
    1.18  CStack<ITimer *> s_tokill;
    1.19 -void TimerSystem::MapChange(bool real_mapchange)
    1.20 +void TimerSystem::RemoveMapChangeTimers()
    1.21  {
    1.22  	ITimer *pTimer;
    1.23  	TimerIter iter;
    1.24 @@ -431,7 +426,7 @@
    1.25  	for (iter=m_SingleTimers.begin(); iter!=m_SingleTimers.end(); iter++)
    1.26  	{
    1.27  		pTimer = (*iter);
    1.28 -		if (real_mapchange && (pTimer->m_Flags & TIMER_FLAG_NO_MAPCHANGE))
    1.29 +		if (pTimer->m_Flags & TIMER_FLAG_NO_MAPCHANGE)
    1.30  		{
    1.31  			s_tokill.push(pTimer);
    1.32  		}
    1.33 @@ -440,7 +435,7 @@
    1.34  	for (iter=m_LoopTimers.begin(); iter!=m_LoopTimers.end(); iter++)
    1.35  	{
    1.36  		pTimer = (*iter);
    1.37 -		if (real_mapchange && (pTimer->m_Flags & TIMER_FLAG_NO_MAPCHANGE))
    1.38 +		if (pTimer->m_Flags & TIMER_FLAG_NO_MAPCHANGE)
    1.39  		{
    1.40  			s_tokill.push(pTimer);
    1.41  		}