1.1 --- a/core/MenuStyle_Valve.cpp	Tue Aug 07 22:11:00 2007 +0000
     1.2 +++ b/core/MenuStyle_Valve.cpp	Wed Aug 08 02:27:10 2007 +0000
     1.3 @@ -383,24 +383,14 @@
     1.4  	return false;
     1.5  }
     1.6  
     1.7 -bool CValveMenu::Display(int client, unsigned int time)
     1.8 +bool CValveMenu::Display(int client, unsigned int time, IMenuHandler *alt_handler)
     1.9  {
    1.10  	if (m_bCancelling)
    1.11  	{
    1.12  		return false;
    1.13  	}
    1.14  
    1.15 -	return g_ValveMenuStyle.DoClientMenu(client, this, m_pHandler, time);
    1.16 -}
    1.17 -
    1.18 -void CValveMenu::VoteDisplay(int client, unsigned int maxTime)
    1.19 -{
    1.20 -	if (m_bCancelling)
    1.21 -	{
    1.22 -		return;
    1.23 -	}
    1.24 -
    1.25 -	g_ValveMenuStyle.DoClientMenu(client, this, m_pVoteHandler, maxTime);
    1.26 +	return g_ValveMenuStyle.DoClientMenu(client, this, alt_handler ? alt_handler : m_pHandler, time);
    1.27  }
    1.28  
    1.29  IMenuPanel *CValveMenu::CreatePanel()
    1.30 @@ -408,19 +398,9 @@
    1.31  	return new CValveMenuDisplay(this);
    1.32  }
    1.33  
    1.34 -bool CValveMenu::GetExitButton()
    1.35 -{
    1.36 -	return true;
    1.37 -}
    1.38 -
    1.39 -bool CValveMenu::SetExitButton(bool set)
    1.40 -{
    1.41 -	return false;
    1.42 -}
    1.43 -
    1.44  void CValveMenu::SetMenuOptionFlags(unsigned int flags)
    1.45  {
    1.46 -	flags &= ~MENUFLAG_BUTTON_EXIT;
    1.47 +	flags |= MENUFLAG_BUTTON_EXIT;
    1.48  	CBaseMenu::SetMenuOptionFlags(flags);
    1.49  }
    1.50