1.1 --- a/core/MenuStyle_Base.cpp	Tue Aug 07 22:11:00 2007 +0000
     1.2 +++ b/core/MenuStyle_Base.cpp	Wed Aug 08 02:27:10 2007 +0000
     1.3 @@ -584,14 +584,12 @@
     1.4  CBaseMenu::CBaseMenu(IMenuHandler *pHandler, IMenuStyle *pStyle, IdentityToken_t *pOwner) : 
     1.5  m_pStyle(pStyle), m_Strings(512), m_Pagination(7), m_bShouldDelete(false), m_bCancelling(false), 
     1.6  m_pOwner(pOwner ? pOwner : g_pCoreIdent), m_bDeleting(false), m_bWillFreeHandle(false), 
     1.7 -m_hHandle(BAD_HANDLE), m_pHandler(pHandler), m_pVoteHandler(NULL), 
     1.8 -m_nFlags(MENUFLAG_BUTTON_EXIT)
     1.9 +m_hHandle(BAD_HANDLE), m_pHandler(pHandler), m_nFlags(MENUFLAG_BUTTON_EXIT)
    1.10  {
    1.11  }
    1.12  
    1.13  CBaseMenu::~CBaseMenu()
    1.14  {
    1.15 -	g_Menus.ReleaseVoteWrapper(m_pVoteHandler);
    1.16  }
    1.17  
    1.18  Handle_t CBaseMenu::GetHandle()
    1.19 @@ -732,22 +730,6 @@
    1.20  	return m_Title.c_str();
    1.21  }
    1.22  
    1.23 -bool CBaseMenu::GetExitButton()
    1.24 -{
    1.25 -	return ((m_nFlags & MENUFLAG_BUTTON_EXIT) == MENUFLAG_BUTTON_EXIT);
    1.26 -}
    1.27 -
    1.28 -bool CBaseMenu::SetExitButton(bool set)
    1.29 -{
    1.30 -	if (set)
    1.31 -	{
    1.32 -		m_nFlags |= MENUFLAG_BUTTON_EXIT;
    1.33 -	} else {
    1.34 -		m_nFlags &= ~MENUFLAG_BUTTON_EXIT;
    1.35 -	}
    1.36 -	return true;
    1.37 -}
    1.38 -
    1.39  void CBaseMenu::Cancel()
    1.40  {
    1.41  	if (m_bCancelling)
    1.42 @@ -756,18 +738,11 @@
    1.43  	}
    1.44  
    1.45  #if defined MENU_DEBUG
    1.46 -	g_Logger.LogMessage("[SM_MENU] CBaseMenu::Cancel(%p) (m_pVote %p) (inVote %d) (m_bShouldDelete %d)",
    1.47 +	g_Logger.LogMessage("[SM_MENU] CBaseMenu::Cancel(%p) (m_bShouldDelete %d)",
    1.48  		this,
    1.49 -		m_pVoteHandler,
    1.50 -		m_pVoteHandler ? m_pVoteHandler->IsVoteInProgress() : false,
    1.51  		m_bShouldDelete);
    1.52  #endif
    1.53  
    1.54 -	if (m_pVoteHandler && m_pVoteHandler->IsVoteInProgress())
    1.55 -	{
    1.56 -		m_pVoteHandler->CancelVoting();
    1.57 -	}
    1.58 -
    1.59  	m_bCancelling = true;
    1.60  	Cancel_Finally();
    1.61  	m_bCancelling = false;
    1.62 @@ -827,58 +802,6 @@
    1.63  	delete this;
    1.64  }
    1.65  
    1.66 -bool CBaseMenu::BroadcastVote(int clients[], 
    1.67 -							  unsigned int numClients, 
    1.68 -							  unsigned int maxTime,
    1.69 -							  unsigned int flags)
    1.70 -{
    1.71 -#if defined MENU_DEBUG
    1.72 -	g_Logger.LogMessage("[SM_MENU] CBaseMenu::BroadcastVote(%p) (maxTime %d) (numClients %d) (m_pVote %p) (inVote %d)",
    1.73 -		this,
    1.74 -		maxTime,
    1.75 -		numClients,
    1.76 -		m_pVoteHandler,
    1.77 -		m_pVoteHandler ? m_pVoteHandler->IsVoteInProgress() : false);
    1.78 -#endif
    1.79 -	if (!m_pVoteHandler)
    1.80 -	{
    1.81 -		m_pVoteHandler = g_Menus.CreateVoteWrapper(m_pHandler);
    1.82 -	} else if (m_pVoteHandler->IsVoteInProgress()) {
    1.83 -		return false;
    1.84 -	}
    1.85 -
    1.86 -	m_pVoteHandler->InitializeVoting(this);
    1.87 -
    1.88 -	for (unsigned int i=0; i<numClients; i++)
    1.89 -	{
    1.90 -		VoteDisplay(clients[i], maxTime);
    1.91 -	}
    1.92 -
    1.93 -	m_pVoteHandler->StartVoting();
    1.94 -
    1.95 -	return true;
    1.96 -}
    1.97 -
    1.98 -bool CBaseMenu::IsVoteInProgress()
    1.99 -{
   1.100 -	return (m_pVoteHandler && m_pVoteHandler->IsVoteInProgress());
   1.101 -}
   1.102 -
   1.103 -bool CBaseMenu::GetExitBackButton()
   1.104 -{
   1.105 -	return ((m_nFlags & MENUFLAG_BUTTON_EXITBACK) == MENUFLAG_BUTTON_EXITBACK);
   1.106 -}
   1.107 -
   1.108 -void CBaseMenu::SetExitBackButton(bool set)
   1.109 -{
   1.110 -	if (set)
   1.111 -	{
   1.112 -		m_nFlags |= MENUFLAG_BUTTON_EXITBACK;
   1.113 -	} else {
   1.114 -		m_nFlags &= ~MENUFLAG_BUTTON_EXITBACK;
   1.115 -	}
   1.116 -}
   1.117 -
   1.118  unsigned int CBaseMenu::GetMenuOptionFlags()
   1.119  {
   1.120  	return m_nFlags;
   1.121 @@ -888,3 +811,8 @@
   1.122  {
   1.123  	m_nFlags = flags;
   1.124  }
   1.125 +
   1.126 +IMenuHandler *CBaseMenu::GetHandler()
   1.127 +{
   1.128 +	return m_pHandler;
   1.129 +}