1.1 --- a/core/TimerSys.cpp	Sun Jul 22 02:01:18 2007 +0000
     1.2 +++ b/core/TimerSys.cpp	Sun Jul 22 16:01:01 2007 +0000
     1.3 @@ -55,7 +55,7 @@
     1.4  
     1.5  void TimerSystem::OnSourceModLevelChange(const char *mapName)
     1.6  {
     1.7 -	MapChange();
     1.8 +	MapChange(true);
     1.9  }
    1.10  
    1.11  void TimerSystem::RunFrame()
    1.12 @@ -208,7 +208,7 @@
    1.13  }
    1.14  
    1.15  CStack<ITimer *> s_tokill;
    1.16 -void TimerSystem::MapChange()
    1.17 +void TimerSystem::MapChange(bool real_mapchange)
    1.18  {
    1.19  	ITimer *pTimer;
    1.20  	TimerIter iter;
    1.21 @@ -216,7 +216,7 @@
    1.22  	for (iter=m_SingleTimers.begin(); iter!=m_SingleTimers.end(); iter++)
    1.23  	{
    1.24  		pTimer = (*iter);
    1.25 -		if (pTimer->m_Flags & TIMER_FLAG_NO_MAPCHANGE)
    1.26 +		if (real_mapchange && (pTimer->m_Flags & TIMER_FLAG_NO_MAPCHANGE))
    1.27  		{
    1.28  			s_tokill.push(pTimer);
    1.29  		} else {
    1.30 @@ -227,7 +227,7 @@
    1.31  	for (iter=m_LoopTimers.begin(); iter!=m_LoopTimers.end(); iter++)
    1.32  	{
    1.33  		pTimer = (*iter);
    1.34 -		if (pTimer->m_Flags & TIMER_FLAG_NO_MAPCHANGE)
    1.35 +		if (real_mapchange && (pTimer->m_Flags & TIMER_FLAG_NO_MAPCHANGE))
    1.36  		{
    1.37  			s_tokill.push(pTimer);
    1.38  		} else {