about summary refs log tree commit diff
path: root/src/game/client/components/menus_ingame.cpp
diff options
context:
space:
mode:
authoroy <Tom_Adams@web.de>2011-03-26 17:44:34 +0100
committeroy <Tom_Adams@web.de>2011-03-26 17:44:34 +0100
commitfbeace52723509604e390f0a20e9f922aa26d1d6 (patch)
treeea60feca2bf3346ef62ce12339e40573dfea9762 /src/game/client/components/menus_ingame.cpp
parentb8f144ba811708bfac82faed438ce389f3d01863 (diff)
downloadzcatch-fbeace52723509604e390f0a20e9f922aa26d1d6.tar.gz
zcatch-fbeace52723509604e390f0a20e9f922aa26d1d6.zip
cleaned up some voting code
Diffstat (limited to 'src/game/client/components/menus_ingame.cpp')
-rw-r--r--src/game/client/components/menus_ingame.cpp8
1 files changed, 2 insertions, 6 deletions
diff --git a/src/game/client/components/menus_ingame.cpp b/src/game/client/components/menus_ingame.cpp
index 4b593989..01efda0a 100644
--- a/src/game/client/components/menus_ingame.cpp
+++ b/src/game/client/components/menus_ingame.cpp
@@ -325,16 +325,12 @@ void CMenus::RenderServerInfo(CUIRect MainView)
 
 void CMenus::RenderServerControlServer(CUIRect MainView)
 {
-	int NumOptions = 0;
-	for(CVoting::CVoteOption *pOption = m_pClient->m_pVoting->m_pFirst; pOption; pOption = pOption->m_pNext)
-		NumOptions++;
-
 	static int s_VoteList = 0;
 	static float s_ScrollValue = 0;
 	CUIRect List = MainView;
-	UiDoListboxStart(&s_VoteList, &List, 24.0f, Localize("Settings"), "", NumOptions, 1, m_CallvoteSelectedOption, s_ScrollValue);
+	UiDoListboxStart(&s_VoteList, &List, 24.0f, Localize("Settings"), "", m_pClient->m_pVoting->m_NumVoteOptions, 1, m_CallvoteSelectedOption, s_ScrollValue);
 	
-	for(CVoting::CVoteOption *pOption = m_pClient->m_pVoting->m_pFirst; pOption; pOption = pOption->m_pNext)
+	for(CVoteOptionClient *pOption = m_pClient->m_pVoting->m_pFirst; pOption; pOption = pOption->m_pNext)
 	{
 		CListboxItem Item = UiDoListboxNextItem(pOption);