core/MenuStyle_Radio.cpp
changeset 1269 27397584df9c
parent 1251 7f9d418693a8
child 1330 ab94316bb52b
     1.1 --- a/core/MenuStyle_Radio.cpp	Tue Aug 07 22:11:00 2007 +0000
     1.2 +++ b/core/MenuStyle_Radio.cpp	Wed Aug 08 02:27:10 2007 +0000
     1.3 @@ -390,7 +390,7 @@
     1.4  	return g_RadioMenuStyle.MakeRadioDisplay(this);
     1.5  }
     1.6  
     1.7 -bool CRadioMenu::Display(int client, unsigned int time)
     1.8 +bool CRadioMenu::Display(int client, unsigned int time, IMenuHandler *alt_handler)
     1.9  {
    1.10  #if defined MENU_DEBUG
    1.11  	g_Logger.LogMessage("[SM_MENU] CRadioMenu::Display(%p) (client %d) (time %d)",
    1.12 @@ -403,23 +403,7 @@
    1.13  		return false;
    1.14  	}
    1.15  
    1.16 -	return g_RadioMenuStyle.DoClientMenu(client, this, m_pHandler, time);
    1.17 -}
    1.18 -
    1.19 -void CRadioMenu::VoteDisplay(int client, unsigned int maxTime)
    1.20 -{
    1.21 -#if defined MENU_DEBUG
    1.22 -	g_Logger.LogMessage("[SM_MENU] CRadioMenu::VoteDisplay(%p) (client %d) (time %d)",
    1.23 -		this,
    1.24 -		client,
    1.25 -		maxTime);
    1.26 -#endif
    1.27 -	if (m_bCancelling)
    1.28 -	{
    1.29 -		return;
    1.30 -	}
    1.31 -
    1.32 -	g_RadioMenuStyle.DoClientMenu(client, this, m_pVoteHandler, maxTime);
    1.33 +	return g_RadioMenuStyle.DoClientMenu(client, this, alt_handler ? alt_handler : m_pHandler, time);
    1.34  }
    1.35  
    1.36  void CRadioMenu::Cancel_Finally()