about summary refs log tree commit diff
path: root/src/game/client/components/menus.hpp
diff options
context:
space:
mode:
authorMagnus Auvinen <magnus.auvinen@gmail.com>2008-09-29 11:34:49 +0000
committerMagnus Auvinen <magnus.auvinen@gmail.com>2008-09-29 11:34:49 +0000
commiteac9658b7395a45d0b48cad340fd9ccf7bec0fde (patch)
treed5bd824038a9b095dd8ea5d9ab4cca88ce1afb0f /src/game/client/components/menus.hpp
parent6d44adb7114a0be6ecb1b0fabc6fe69d308cad1c (diff)
downloadzcatch-eac9658b7395a45d0b48cad340fd9ccf7bec0fde.tar.gz
zcatch-eac9658b7395a45d0b48cad340fd9ccf7bec0fde.zip
added voting gui and a lot of other minor changes
Diffstat (limited to 'src/game/client/components/menus.hpp')
-rw-r--r--src/game/client/components/menus.hpp13
1 files changed, 13 insertions, 0 deletions
diff --git a/src/game/client/components/menus.hpp b/src/game/client/components/menus.hpp
index 0349ec80..abe26135 100644
--- a/src/game/client/components/menus.hpp
+++ b/src/game/client/components/menus.hpp
@@ -48,6 +48,7 @@ class MENUS : public COMPONENT
 		PAGE_NEWS=0,
 		PAGE_GAME,
 		PAGE_SERVER_INFO,
+		PAGE_CALLVOTE,
 		PAGE_INTERNET,
 		PAGE_LAN,
 		PAGE_FAVORITES,
@@ -68,8 +69,15 @@ class MENUS : public COMPONENT
 	static INPUT_EVENT inputevents[MAX_INPUTEVENTS];
 	static int num_inputevents;
 	
+	// some settings
+	float button_height;
+	
 	// for graphic settings
 	bool need_restart;
+	
+	// for call vote
+	int callvote_selectedplayer;
+	int callvote_selectedmap;
 
 	// found in menus.cpp
 	int render();
@@ -77,8 +85,13 @@ class MENUS : public COMPONENT
 	//void render_loading(float percent);
 	int render_menubar(RECT r);
 	void render_news(RECT main_view);
+	
+	// found in menus_ingame.cpp
 	void render_game(RECT main_view);
 	void render_serverinfo(RECT main_view);
+	void render_servercontrol(RECT main_view);
+	void render_servercontrol_kick(RECT main_view);
+	void render_servercontrol_map(RECT main_view);
 	
 	// found in menus_browser.cpp
 	SERVER_INFO current_server_info; // should this be here?