fixed votekick menu (#807)

This commit is contained in:
Tom Adams 2010-05-31 15:36:20 +00:00
parent dca90950e6
commit 23e2d5f424

View file

@ -293,40 +293,40 @@ void CMenus::RenderServerControlServer(CUIRect MainView)
void CMenus::RenderServerControlKick(CUIRect MainView) void CMenus::RenderServerControlKick(CUIRect MainView)
{ {
// draw header int NumOptions = 0;
CUIRect Header, Footer; for(int i = 0; i < MAX_CLIENTS; i++)
MainView.HSplitTop(20, &Header, &MainView); {
RenderTools()->DrawUIRect(&Header, vec4(1,1,1,0.25f), CUI::CORNER_T, 5.0f); if(!m_pClient->m_Snap.m_paPlayerInfos[i])
UI()->DoLabel(&Header, Localize("Players"), 18.0f, 0); continue;
NumOptions++;
}
// draw footers static int s_VoteList = 0;
MainView.HSplitBottom(20, &MainView, &Footer); static float s_ScrollValue = 0;
RenderTools()->DrawUIRect(&Footer, vec4(1,1,1,0.25f), CUI::CORNER_B, 5.0f);
Footer.VSplitLeft(10.0f, 0, &Footer);
// players
RenderTools()->DrawUIRect(&MainView, vec4(0,0,0,0.15f), 0, 0);
CUIRect List = MainView; CUIRect List = MainView;
UiDoListboxStart(&s_VoteList, &List, 24.0f, Localize("Players"), "", NumOptions, 1, m_CallvoteSelectedPlayer, s_ScrollValue);
for(int i = 0; i < MAX_CLIENTS; i++) for(int i = 0; i < MAX_CLIENTS; i++)
{ {
if(!m_pClient->m_Snap.m_paPlayerInfos[i]) if(!m_pClient->m_Snap.m_paPlayerInfos[i])
continue; continue;
CUIRect Button; CListboxItem Item = UiDoListboxNextItem((char *)&m_pClient->m_Snap+i);
List.HSplitTop(ms_ButtonHeight, &Button, &List);
if(DoButton_ListRow((char *)&m_pClient->m_Snap+i, "", m_CallvoteSelectedPlayer == i, &Button))
m_CallvoteSelectedPlayer = i;
if(Item.m_Visible)
{
CTeeRenderInfo Info = m_pClient->m_aClients[i].m_RenderInfo; CTeeRenderInfo Info = m_pClient->m_aClients[i].m_RenderInfo;
Info.m_Size = Button.h; Info.m_Size = Item.m_Rect.h;
RenderTools()->RenderTee(CAnimState::GetIdle(), &Info, EMOTE_NORMAL, vec2(1,0), vec2(Button.x+Button.h/2, Button.y+Button.h/2)); Item.m_Rect.HSplitTop(5.0f, 0, &Item.m_Rect); // some margin from the top
RenderTools()->RenderTee(CAnimState::GetIdle(), &Info, EMOTE_NORMAL, vec2(1,0), vec2(Item.m_Rect.x+Item.m_Rect.h/2, Item.m_Rect.y+Item.m_Rect.h/2));
Button.x += Button.h; Item.m_Rect.x +=Info.m_Size;
UI()->DoLabel(&Button, m_pClient->m_aClients[i].m_aName, 18.0f, -1); UI()->DoLabel(&Item.m_Rect, m_pClient->m_aClients[i].m_aName, 16.0f, -1);
} }
} }
m_CallvoteSelectedPlayer = UiDoListboxEnd(&s_ScrollValue, 0);
}
void CMenus::RenderServerControl(CUIRect MainView) void CMenus::RenderServerControl(CUIRect MainView)
{ {
static int s_ControlPage = 0; static int s_ControlPage = 0;